It sounds like TopoFusion could be the best option. You can display multiple tracks, and it has sophistucated track editing tools. www.topofusion.com
If you decide to use Ozi, you should try downloading DOQQs (aerial photos) and importing them into Ozi, using the attached georeference info. It's a little more complicated in terms of the initial learning curve, but there is no manual calibration required.
Rich Owings
www.MakeYourOwnMaps.com