ok, phone upgrade time again with o2

i want the N80 but o2 want 130 quid for my yearly upgrade and theres nothing they can do to drop the price etc even though a N80 to a new o2 customer is only 100 quid.

orange have the same phone for only 50 quid but the tarrif isnt as good, for my 30 quid a month now i get 400 mins and 1000 texts, for slightly a bit more on orange i get 200 mins and 1000 texts,

what would you do ? stay with o2 and stump up 130 quid or swap to orange for the cheaper phone but not quite as good tariff ?

another thing to do is offswet the cost of the o2 phone by selling my 6680, so how much is a 9 month old 6680 worth that could do with a new facia but comes with original 64mb mem card plus a 128mb mem card with tom tom mobile 5 on it plus a additional 512mb mem card ?

really dont know what to do the robbing coooooonts lol

matt