Got the controller sorted.
I shortened the trem plate by 10mm or so as it was too long and sitting on the Star Wars logo at the back, rounded the edges off and drilled 2 new screw holes, then drilled a 25mm hole in the middle:
And glued the round controller in place. All soldered and tested now:
Just have to screw in place and take photos!