Well, that update has got to have been the most annoying challenge to get. I finally got mine following the bounty post(
http://forum.xda-developers.com/showthread.php?t=748392 ) at xda using AmonRa v1.7.0.2 recovery and the stock 2.2 netarchy rom. I did go back to Calkulins EViO 2.1 for a try to instigate the OTA which it did and I just let it sit there while I read more until it either went away on it's own or due to a text coming in. I jumped to damageControl 3.5 for some tries and then settled to just following the XDA post for I think 3 tries. The 1st try I did do the offered update to voicemail and then stayed with the repeat of ##786# and did the wipe in the same order as posted. This last time that it finally worked I skipped setting up my gmail. I just figured I would post my results to see if there was something that stood out that may be a trigger for it working for anyone that has had no luck yet. I was seriously ready to throw in the towel. Good luck.