Likewise I swapped my Fazer600 in July for an F2 storm, great move.
It really depends on how much you've got to spend, I neally bought a new parallel import but the difference in cost didn't warrant the hastle in servicing at their premises.
The F2 storm has a bigger tank (which is useful) and better front forks than the original. But don't epect much more than 130 to a tank full.
There are quite a few posts on this site re dodgy cam chain tensioners, so listen for this when taking a test ride. But i'm no mechanic.
Take a look at the Workshop forum for pointers in the right direction.
Theres loads of potential add-ons with the storm, take a look in the gallery to see what you can do, and in the For Sale forum for any potential bargains. Fluffys looks good!