If you are at peace 20 months later, then I think that you should continue to have separate celebrations.
This way everyone gets what they want. No one, except the father-in-law, is saying that you have to be together.
It’s probably more pleasant without the tension and the gameplaying. I wish you both luck and more travels. Thanks for keeping us posted!