It's supersimple.
Just dump openvpn and install wiregaurd.
It's a standard procedure in the setup of PiVPN.
It builds a connection with PiHole in the installation procedure. No tinkering no nothing, straightforward.
Plus that on Android you will get a new tile in the menu to activate/deactivate Wireguard.