Move what is leapsecond independent to UT1, the atomic clock basis -- google, finance, etc now happy
Keep UTC etc as is, since offests happen all the time to every other human clock anyway for political or summer time or country boundary changes anyway -- everyone else happy
And calculating UTC as offests from the consistent base of UT1 sounds like the way to do it