I really like the S90, but it doesn't have HD video, which is a must-have for my next camera.

I really like the SD4000, which has (roughly) the same optics and sensor as the S90, an it can do HD video. But as an Elph, it's got limited manual controls, and no RAW; since this is going to be my backup for places

I'm not in a huge rush to get a new camera, but was wondering if there are any similar $350-$400ish cameras which are worth looking at which would be comparable to the S90, or if it's better to wait to see if Canon comes up with a successor to the S90.

(Right now, my non-DSLR option is an old S60.)