Need help with OpenVPN setup on Pi-Hole to run Full and DNS only vpn connections

Recently I’ve setup a pi-hole that can be connected to locally and via a VPN, however, there are some cases where I just want the DNS traffic to be routed to the pi-hole instead of fully tunneling to the VPN. My server.conf files look like this (I believe I have them set up properly & both are different ports):

# Server 1 (Full TUN & LAN)
server 10.8.0.0 255.255.255.0
push "redirect-gateway def1 bypass-dhcp"
push "route 192.168.2.0 255.255.255.0"
push "dhcp-option DNS 192.168.2.83"
# Server 2 (DNS Only)
server 10.9.0.0 255.255.255.0
#push "redirect-gateway def1 bypass-dhcp"
#push "route 192.168.2.0 255.255.255.0"
push "dhcp-option DNS 10.9.0.1"

The only issue I am having is executing and running server 2 to know if it works properly. I followed the docs (https://docs.pi-hole.net/guides/vpn/dual-VPN/) and such however when openvpn installs it installs the server to

/etc/openvpn/server/

instead of

/etc/openvpn/

As a result of starting openvpn@server2 I run into this problem:

Jul 04 23:09:40 eventhorizon ovpn-server2[7710]: Options error: --dh fails with 'dh.pem': No such file or directory (errno=2)
Jul 04 23:09:40 eventhorizon ovpn-server2[7710]: Options error: --ca fails with 'ca.crt': No such file or directory (errno=2)
Jul 04 23:09:40 eventhorizon ovpn-server2[7710]: Options error: --cert fails with 'server.crt': No such file or directory (errno=2)
Jul 04 23:09:40 eventhorizon ovpn-server2[7710]: WARNING: cannot stat file 'server.key': No such file or directory (errno=2)
Jul 04 23:09:40 eventhorizon ovpn-server2[7710]: Options error: --key fails with 'server.key': No such file or directory (errno=2)
Jul 04 23:09:40 eventhorizon ovpn-server2[7710]: Options error: --crl-verify fails with 'crl.pem': No such file or directory (errno=2)
Jul 04 23:09:40 eventhorizon ovpn-server2[7710]: WARNING: cannot stat file 'ta.key': No such file or directory (errno=2)
Jul 04 23:09:40 eventhorizon ovpn-server2[7710]: Options error: --tls-auth fails with 'ta.key': No such file or directory (errno=2)
Jul 04 23:09:40 eventhorizon systemd[1]: openvpn@server2.service: Main process exited, code=exited, status=1/FAILURE

I thought for the service you might just change

WorkingDirectory=/etc/openvpn
ExecStart=/usr/sbin/openvpn --daemon ovpn-%i --status /run/openvpn/%i.status 10 --cd /etc/openvpn --config /etc/openvpn/%i.conf --writepid /run/openvpn/%i.pid

to

WorkingDirectory=/etc/openvpn/server
ExecStart=/usr/sbin/openvpn --daemon ovpn-%i --status /run/openvpn/%i.status 10 --cd /etc/openvpn --config /etc/openvpn/server/%i.conf --writepid /run/openvpn/%i.pid

but that didn’t seem to be the case. Obviously I’m missing something, any help is much appreciated.