Having read Homer's latest post. I have to say that I agree.
It's so difficult answering questions "remotely" like this. At the back of your mind is always the thought "where do you stop".
Easy to spend someone else's money. But, if it were me, given a long standing leak problem, I would also take the tray out and start again.
We really don't know the state of the floor under the tray, or even the joists.
If you get someone in now, they'll tile and walk away. They couldn't be held responsible for any hidden problems.
Get a decent tradesman in. He can then take out the tray, and start afresh. Any problems after that, and you can most likely call him back. I'm sure there won't be though.