Regarding the update not showing up, it seems like sometimes the old OTA link might be getting cached perhaps on the blackberry itself. There have been quite a few people report success detecting the update and getting it - I don't think it's a problem with the code or anything like that...Same thing happened when I put up the v2.0 download when I first put it up and then it just magically went away at some point
I haven't actually experienced it myself so I'm not too sure if this will work but maybe try opening up the BlackBerry browser and going to Options - Cache Operations and clearing your cache?
Regards,
eZainny.