Cheers for all the advice guys. It sounds like a bit of proper work is required rather than a further bodge!
gcol, this is probably the best idea but not sure i have the technical skills at present! The other thing is, you can't see it from the pictures above but the bath is not set against...