Ok, below is my last contibution to the thread with a few pics.
In the end, the driver side fit fine with no issues. The passanger side would not lock in (nor seat with the connector providing power) even with the dremmel hack. What I had to do was the following:
-Remove connector from the headlamp tray and connect to the lamp manually
-Fashion a small piece of metal connected to the body to apply pressure to hold lamp in
-Cut a small hole in the "frunk" surround to allow bolt to pass through (otherwise it pushed up on the surround)
The lamp fits nice and tight and no worries about it coming loose. Also, I have had no issues with the power staying connected since I removed the connector/harness it from the headlamp tray.
The pics should pretty much explain it all:
