In the same boat as you, I’ve just used this as an excuse to flip the roles of the regular and VPN connections.

Used to be VPN when needed. Now it’s full time with exceptions as required.