Yeah looks like it, I didn't have much of a chance to check via Wireshark but I opened ports TCP: 37777 UDP: 37778 for the Wireguard connection to test it from the outside, if it works, I'll disable P2P.
Not to install Software/Hardware but to re-wire cameras & replace older ones, go into the...