Retirement tax questions

No, it would not be better to wait... because the IRS may charge you $50 for not filing Form 8606, even though the event is not taxable. I recommend amending to avoid the $50 penalty.