stick with the N95 and barter for a better deal on your contract, you can often get a good deal if you choose not to upgrade.

there's very little difference between the n95 and n95 8gb so no point upgrading from one to the otehr imho