ok, round 2 completed.
Apparently orange have updated their data limits on contracts today, so there is no such thing as unlimited internet, and it was even suggested that the FUP has been removed and there are now limits of 500MB, 750MB, and 1GB.
So for £27.50 on a 24 month contract I get a free Omina 7, 600 minutes, unlimited texts, 750MB internet, 50 picture messages, unlimited email, and SatNav (not that it's compatible with the Omnia at this time). So in terms of TCO, it's £10 extra (42p per month), and I get an extra 250MB per month, 50 picture messages per month and SatNav more than my original deal. Bargin
All I have to do now is wait for their new stock to get into the system (upto 48 hours) and sit and wait with a big grin on my face