Chris, I bought an MK satellite socket tonight from B&Q which you use the standard plugs on either side (none of the connector nonsense) which you'll probably find easier. Basically works the same way as a straight connector. Probably ideal for you as it should fit in your existing mounting box.
HTH.