langers1972: Thanks for all those that took the time to contribute, have ended up plumping for a 5800 off TradeMe so I'll see how I go.
Make sure you update the firmware as soon as you get it.
If you need to change the product code, do so. It's worth it.
Personally, I don;t think you'll regret your choice. Particularly with the improvements in the music player and with the free GPS for life.