There’s an easy solution nobody seems to be considering. We put rockets on the moon to continually adjust its orbit in order to preserve perfect adherence to a 24-hour solar day.
Hell, once we’ve perfected this technique we could even use it to gradually pull us into a perfect 365-day year! Or better, 364 days, which is evenly divisible by 12 (edit: oops, 13) months.