drob1984 thanks for presenting your story and advice, also thanks for everyone else that has provided feedback and guidance.

Long story... shorter, here are the steps I've taken and how things are currently:

Client initially determined contract from 1 April onwards to be "inside...