Do not compound the error by filing a second amended return until the first ones have been fully processed. Then if you still need to file the form 8606 it must be attached to a 1040X form or it may/could be rejected.
