You can do the OTA, provided its not the same version, or HTC doesn't release it to those who already applied the leaked update. I remember this happening a few years back.. I want to say with the Hero (maybe it was the EVO), where HTC pretty much left people who'd updated a leaked version in the dark for about a month, because updating to the leaked version threw those who did "off the upgrade path" or some BS. Either way, I'm sure once it's released, it'll be as easy as getting the .zip and applying it that way again, unless of course, the final is the same versrion AS the leaked, then there won't be any need to re-apply, etc.