It's possible you will see an message about updating your phone via the
OTA update. If you do, you will NOT want to apply it – it could brick
your phone.

You WILL have to return your phone to stock, including downgrading the
antenna update to version 1.0, otherwise the OTA could brick your phone.

However, once the OTA is released it shouldn't be too long before
someone creates a ROM with the official 2.2 update and new antenna. So,
you can either return to stock and update or wait for a ROM.