Wait until the N900 is totally revealed, and then make the decision. If there's a need for such a device now(-ish), then get the N97. It will have ample value by the time the N900 comes out that it will be suitable to make that comparison and then move/not-move then.