Well done. It is a big pain!!!
I won't do NPS with Azure MFA deployments anymore. I keep having them break every year or two, and they are really hard to debug.
I think if I couldn't do AnyConnect because of the templates, I would use something like Cisco Secure Access or Cisco SecureConnect - where users VPN into a Cisco cloud head end, and then use AutoVPN to get back to what they need to connect to.