I dont noe about PS CS, but dedicated pano software (inc. panorama factory) can actually twist your photos to fit, as well as make some adjustments to your exposure settings and so on.
I am using Arcsoft Panorama Maker. You can easily find these from downloads.com, but many of them are shareware.