Complete rally dash frame removal

Steve "just me" but I would darn sure reverse the clips along the windshield and install the screws from below. Then you can get it out with the windshield in. You may or may not need shorter screws.

I wish you better luck on leaks than on my Scamp. I still don't know what is or is not leaking for sure, this spring has been AFU