Thanks Securespark, I opted for the latter, albeit minus the isolating switch which I will attempt to rectify next time we have a spark over.
All functioning as required now.
Thanks for your assistance everyone, it's really decent of you all to help guide me to a safe and satisfactory...