I also haven't upgraded from the cs creative suite. Can't find a reason why I should. And I also still use PS7 for most things, as I have, over the years added plugins, shapes and styles, many of which I made myself, that PSCS doesn't want to use. As to which one OF the two would I recommend. Then Photoshop, hands down. Just watch your text. Rastered text sucks but you can maintain vectors if you build and save the file correctly This really only applies if you design for print. Although scalable vector images are needed for screen as well at times