After you file

You can file now and amend later if needed ... the form 8606 can also be filed on it's own.