I got him to put down the phone and walk outside with a tape measure (without knowing why!) so I don't want to bother him again today.
But it is the first one, before they widened the track. He has the permanent top; probably what saved his butt when it rolled over.
I haven't compared the two vehicles but I remember the windshield as being pretty tall.
How about making the stock windshield have an adjustable rake like an old Austin-Healey?