I think getting rid of leap seconds is best. A few centuries from now, when time has drifted an hour, let's turn the clocks forward an hour. If we can manage to do Daylight Saving Time every year, 500 years from now I imagine we will be able to find a solution.
Another option is to switch to Unix Time for science and communications. No leap seconds or earth rotation to worry about.