Upgrading to an N97 on 3

Sophia in the Chiswick branch of 3 was very helpful. She can upgrade me for free to a Nokia N97 – but it’ll be the equivalent of a 21 month contract. What do you think? Should I wait and hope 3 introduces an Android handset worth getting?