Hi Greg,
I use Panorama Factory, and I believe it does a great job.
Yes it does do multi row stitching.....Its not automated, but works ( i tried it)
Here is the link on how-to.....
I have also used Hugin, but didn't find it as intuitive as PF. That might be cause I havn't used it all that much.....must try again
.
Hope this helps
Cheers
Bartman