Yes, I saw your suggestion right after I wrote this question.

I think it should have way points even if the trade off is that a probe is destroyed after so many trips etc.

I do not like having to micro manage probes so much.