Setting the global desktop environment on RHEL 7.4 Client

We're trying to set the global default desktop environment in RHEL 7.4 Client to be gnome rather than gnome-classic as we think it'll provide a better experience for users when they first login. We want to keep gnome classic in case anyone likes it.

We've followed this article:

https://access.redhat.com/solutions/1125833

and have managed to get it to do what we want, but we're a bit concerned that we have to move around files that are controlled by system RPMs and an update to these RPMs will simply add the moved files back in producing duplicate entries in the desktop selection screen.

Anyone any idea how to do this without moving around files that really shouldn't be moved around or altered?