If you deposited the money back in the IRA within 60 days, that is a rollover, not a contribution. If you waited longer than 60 days, it is a withdrawal.
For the 1099-R with 65K withdrawal, you will be asked "did you rollover all the money or do something else". Check the box for "something else" and then check the box for a "partial rollover." Indicate that the first $30K was a rollover. The other $35K is taxable. Don't list the $30K rollover as a contribution, but do list any additional contributions you might have made.
