This was almost my exact situation. I will do the same as you have done. I will file my original (incorrect) state return, and in another week file both amended returns. This was an extremely exasperating experience! Thanks so much for your explicit explanation, and real help.
