There might be another way to accomplish this using a different paradigm.
Google BeyondCorp or Perimeter 81 are both Zero Trust products that can link local applications, sites and services with cloud based services. Basically you create a site to site VPN to Google BeyondCorp or Perimeter 81 and then manage everything through those services. For instance, you want to provide Remote Desktop in a secure manor to a RDS server. You would configure the either vendor site with a Remote Desktop link, and grant access to the users who need that service.
Users are authenticated into Perimeter 81 or Google BeyondCorp and see a screen with the services and application that they access to. Google BeyondCorp can use user and machine certificates as part of the authentication process. Perimeter might be able to do that as well.
One benefit that is made clear during this Covid19 lock down, is that instead of all employees coming in through a VPN and overwhelming the firewall, there is only one VPN connection that the firewall needs. The employees sign into the BeyondCorp or Perimeter 81 site instead. This is more scalable and secure that a traditional VPN solution.
I apologize that this is a short and incomplete summary of these products. My intent was only to make you aware of different options for your VPN solution.
Dave Anderson