Retirement tax questions

You  are correct on both counts ... you are working the system perfectly.