The problem I found is T-Mobile never even sell the handset I want anyway, so I have never upgraded. I have however renewed my contract and got a £10 discount each month, so its not too bad.

I am not expecting to replace the N900 quite as quickly anyway. I likely would never have ordered the N900 if my Xperia X1 had come even close to delivering the experience I expected from it. A huge reason I got rid of it was the case cracking design flaw, did not want it to fall apart as soon as my warranty ran out.