OP,
If you wait I'd certainly just make sure that you have all of your supporting docs together (I.E. tax returns, tax transcripts, marriage certificate, ect.) by the time you fill out your FAFSA because FAFSA requirements tend to throw you for a loop.