Shrek 2 and Shrek 4, plot hole??

Maybe someone has already pointed this out but I’m just thinking about this. In shrek 2, we learn the Prince Charming would have eventually went to save Fiona from the tower and she was never supposed to meet Shrek, had Charming been more timely.

In Shrek 4, Shreks over parenthood and makes a contract with Rumple for a day of freedom, which leads to Rumple stealing the day he went to rescue Fiona (right?). So then it shows this whole timeline of what would have happened if Shrek didn’t rescue Fiona. BUT wouldn’t Prince Charming have come and rescued Fiona? And why were Fiona’s parents so concerned if her dad made the deal with the fairy god mother that Fiona would eventually be rescued by Charming?

I’m smelling a plot hole! LOL

Sincerely,

A 28 year old rewatching all of these movies with her toddler. But the toddler really only cares about the OG Shrek so I’m a lil fuzzy on 2, 3, and 4 because she doesn’t really sit still for those!