As noted, if the windshield frame is custom, it is highly likely that none of the tops for the factory configuration are going to fit. Best plan? I would be looking for a 3A windshield frame if you don't care about it being a perfect 2A. The 3A frame is about twice as strong and has a better top/door fastening system. You would just need to purchase a top for a 3A.
About the only real game in town for new soft tops are the Bestop Tiger Tops. New Life will make a canvas version like the original factory tops, but at least in my opinion, the Bestops are far more functional, last longer in the elements, and are cheaper. I also like the looks better. Bestop has very good customer service.
1947 CJ 2A, 1949 CJ 3A, 1955 CJ 3B, 1968 CJ 5, 2012 JKUR