Retirement tax questions

Correct. The 5 year rule applies to both.