We should just have a standards body that meets each decade and decides what epoch time every day for the next 10 years officially starts on. Everyone knows ahead of time how it will work, software updates have predictable change intervals, it allows us to refresh time based on policy decisions, and it uses something sane as the backbone of the system.
Every 10 years is just the right frequency that most software breaks, but it causes frequent pain for everyone. Switching to leap hours that have to be dealt with every few thousand years would be much preferable.