If you are thinking about updating your router, you may just want to install Wireguard directly on a new router, which would remove the need to do port forwarding, and reduce latency.