(FYI) We successfully upgraded from 9.4.0.10 to 9.4.0.23 which resolved the Xs/Max enrollment issues. We did not encounter any issues during the upgrade.
The new models are listed as just ' iPhone' instead of ' iPhone Xs' like I would expect/hope for.