As you are going from a short haul to a long haul which is $$$ I would want substantial padding. As said above. say the short haul goes MX, when is the next possible flight that would get you there without any interruption?? Depending on the long haul flight time I might even fly the night before. Which I have done a couple of times. Book a hotel, enjoy a nice dinner.