Yes, you should wait until the IRS recalculates your original return and you get the additional refund. Filing an amended return before that would cause a great deal of confusion that would take a long time to straighten out.
Since the IRS gets a copy of the corrected 1099-G, it's possible that they will take that into consideration. You just have to wait and see what happens.
