hi mate
mate of mine has n95 8gb, i put tomtom on for him the other day and got it working fine with the internal GPS.
Get the 8gb on your new contract, if u want the n96 when it comes out, get the 8g put on ebay, you'll still get 250+ and then buy the n96.
Not a bad phone tbh, although I'm gonna wait 4 weeks and get the iphone 3g.