I think this combined with the solution provided in this comment Will be the most robust approach and solve all your problems.

That’s what I would do