That's a fair point, and this is still an improvement over the current system.
Lets go with this for now, and a simpler setup may become clear in the future.