Well i eventually found a solution to this, I found a C&K Switch 611/621 series would pretty much fit.
I contacted them, however after a quick chat they informed me that the usual Paddle type of switch for these PSU's, i.e. 621 series, had a MOQ of 100, and i wasnt 100% sure that the pins would fit.
So i bought the most convenient switch from Farnell, C&K DM61J12S205Q, Order Code:2931730
This was pretty much a perfect panel mount fit, however a few differences;
1) This is a 611 series, "Rocker" type instead of the Paddle type.
2) The Terminals are solder lug, so i looped some 20AWG tinned copper wire through the solder lug, then into the PCB holes. with some heat shrink over just for extra caution.
3) It was very very close depth wise before hitting the terminal/switch PCB. So it marginally fitted on mine, however others may have difficulty.
But overall, in my case, it fits, it works and can take the full 2A just fine

So thought id pass it on as a possible solution!