If you’re in a situation where you can replace your router with a pfsense or opnsense as per that guide I would definitely go for it. I’ve setup some pfsense devices with openvpn servers and it’s been one of the smoother installs imo and they make the self-signed client certificate part really easy to get right.