Here's a thought, Joey,.
Ask the Builder to help you with the windshield change/ mod. etc..
HE WOULD KNOW..
Thanks for sharing the Photos...