If Vanguard will take off average cost basis, and then put it back later (years from now), then you don't have to worry about IRS as long as you report what is shown on your 1099-B from Vanguard.
I hope you have properly verified that these changes will be giving you the effects you want.
