State tax filing

I had this problem last year and the state won't recognize that the refund is valid, since the address on the W-2 is in that state. I am waiting for the corrected W-2. So would it be better to go ahead and file now and do an amendment when I get the corrected W-2, or should I get an extension and then file at that time asking for the refund. (the question also applies to the state return where I live since the corrected W-2 will change the AGI for my state and change the tax owed to my resident state.