I couldn't get my windshield frame to fit either so I tucked it underneath. I cut and pivoted the upper glass a bit too. Later I realized the windshield wipers wouldn't work that way. Oh well. I should have just fabbed a new one like you did which is much better looking.

[ATTACH=full]144959[/ATTACH]