The startup_delay seems to be doing the trick for me but it is true that the extra delay is a bit anoying and inefficient when simply starting or re-starting MSR. Before seeing your answer I was thinking that the start_delay should only apply when an improper shutdown is detected (kinda equivalent to power loss) but your solution with the startup_wait is much better. I will be on the lookout for it.
Thanks again.