Just wanted to mention, after doing the factory wipe it's fixed everything. I'm now on BTU with Wi-Fi calling up and running.
Thanks to all for your help and advice. I genuinely didn't think a factory wipe would make any difference to just flashing the CSC (which erases phone). Thanks again though