The problem I had was that the new reflector stuck out the front of the rim too much it looked wrong as you could see the back part of the reflector

I spent ages looking at how to move it all further back in the rim as the standard rubber gasket that holds your glass on the reflector wouldn't fit. I found that a bulk CD case was the correct diameter and I cut a small 4 or 5mm deep ring off the top of the case with a hot knife on the gas ring. I then lost the top again with a hot knife. I ended up with a translucent ring of plastic that fitted in the rim then the JB light went in and the tabs bent down to hold it all in place. The ring cannot be seen and as belt and braces used some silicon on the back side

The tabs as shown above were a little short by the time it was stepped back.
You will have to loose the junction block as its all a bit tight otherwise. I used the Wago connectors and these are perfect Look On ebay you can get them in 2 3 4 or 5 way, unfortunately you will need to loose the bullet connections. I did try to save the connection block by mounting it vertically but the connections are all live on the back side and it was too easy to short out on the frame.
The JB setup is well worth the trouble IMO