I finally decided to add the JD Air canopy latch. I found out it was only $130 and a small amount of metal work (the parts you use are 100% compatible with the ones from before). This, combined with my decision to go with Classic Aero for my interior made the decision come to a head.

Start off by drilling out the BOTTOM BRACKET only. You can leave the top one in place. Then you align the template for cutting using the existing slit as a guid and trying to match the edges with the edges of the holes. The dimples from the previous holes on the corners are the only part that require a little finessing and in the end you will have a very tiny gap should you elect to remove the hole completely (which I did). I am talking only 1mm though so you won't notice it. Better to have the edge clean and straight.

After that you install the mount and match drill the bottom bracket. Rivet the bottom bracket to the skin and install the hardware. I was very please how easy this task was. Only 3 hours from start to finish.