I'm not sure how CS5's PhotoMerge ranks for quality vs. everything else. A few years back I found that Microsoft Research's ICE (Image Composite Editor) did the best stitching by far of anything I had access to. It can't hurt to try it out.