Hi David,
A thousand thanks for spending time on this issue and coming up with this answer.
Your solutions sound very good indeed. I was concerned about the modal not fading away on its own but I guess I’ll have to pass on that 
Thanks again,
Jeremy