That all sounds good, I think I will get the job booked in with someone and then see what can be done once its all out as I fear...
Toilet can't be relocated due to waste pipe sizes.
The bath wont fit turned, the diagram is a bit generous, the toilet goes much further into the room that it suggests.
Funny you mention moving that wall as I am quite tempted to, but to open that whole area up and create an additional virtual room.
Also, I quite like rolling off the toilet straight into the bath.