@Kynan, I like the way you've averted the Portuguese succession crisis. I just wonder about the idea of Mechthilde of Bavaria ending up as duchesse d'Angoulême. Wasn't she married to her OTL husband as part of a treaty between Bavaria and Baden or something?
It wasn't a treaty per se, Philibert of Baden (her OTL husband) was her dad's ward, and he married her. Although the marriage was concluded without a covering dispensation for the affinity (they were 3e cousins), and the pope was pissed about it and excommunication/dissolution of the marriage only averted by the couple's agreement to a fine of both cash and the establishment of an almshouse (or somesuch). Also, Mechthilde was betrothed to Philipp Magnus of Brunswick until his death at Sievershausen in 1553.
With a POD in the 1520s, it seems that her fate is still nebulous enough that she could end up with Berri.