Are you getting glass that comes already cut for a CJ? Last one I put in took longer to cut the glass than it took to zip it in the frame. I used the broken windshield as a template and cut the windshield out of what was left of a sheet of 4' X 8' tempered glass. Cheaper than ordering a CJ windshield and quicker than ordering one. Most glass shops will have what you need and can cut one out in just a few minutes.
You could do the same if you can make yourself a template out of a "sheet" of cardboard to match the frame opening. Just reduce the outside dimensions enough to account for the gasket thickness. Place the cardboard pattern on the glass, mark it, etch it, burn it and snap off the excess. Won't matter how out of specs the frame is doing it this way.
Good luck!
Third windshield...........That's a bummer for sure