Assuming that the update IS being pushed back, it's not because of the unofficially official update being leaked, it's because there were more problems that were found by people who loaded the unofficially official update. So don't blame the testers, thank them for finding out possible problems with your soon-to-be update.
Also, considering that the testers found the file and updated their phones manually, can't HTC just send the OTA to those with 2.1, and OFFICIALLY release the updated zip file to the early Froyo adopters so they can manually update their phones again?
This way, the 2.1 people get their update OTA, and the early adopters get the same exact file/version, but are forced to manually update it. I mean, it's not like the early adopters don't already know how to do that right?
Just my 2 cents.