I think the best solution for minimising overall _long-term_ hassle is to switch to using TAI internally and UTC for display.