Nokia N96: Bad timing?

I don't know why the buzz about the new Nokia N97 didn't reach my ears. Just after i ordered the already in the market Nokia's flagship phone Nokia N96 that i got to hear about this new Monster device from Nokia. Nokia N97 features all the cool features from Nokia phones like GPS, Wifi, enough Internal Memory and option for expandable memory....etc.

Nokia N97

Nokia N96

And i love the full (QWERTY) keyboard which the Nokia Nseries phones lack. This phone is not yet in the market, it will be released sometime next year around June.
So, the question is should i return my Nokia N96 and maybe get a smaller and less expensive Nokia phone while i wait for this cool device or should stick with Nokia N96 and hopefully by the time the N97 comes out i will be ready to change my phone. I don't regret buying the phone but i always have to get the top of the brand.

Nokia n97