6630 vs ????

Looking to upgrade my 6630 soon, I previously owned a 6600 and a 7650 so want to stay with a Symbian phone.

I like the 6630 but its an early model so is a bit buggy.
I'd like something with:
~ built in video calling (ie I dont have to use a cradle to get front video capture)
~ built in camera flash
~ at least 2 mega pixel camera
~ larger internal memory
+ all the features I already have on the 6630

Im toying with an N series, maybe the N90.

Can anybody point me in the correct direction please :)

N80 8-)