After you file

I would not mail in your return again. That may cause confusion in the processing.

If the IRS or CA wants to see your W-2 forms, they will request them. They already receive the information from your employer as well.