I would keep the AK ones for all the reasons you mentioned. I haven't been at TDay week but I know that MK has the most FP+ attractions so I would think there might still be a few things you could do. I would jump on
MDE right after you scan at KRR and grab something in MK that you guys are interested in for late afternoon.
And I like the semi-plans for AK. I know that sounds weird coming from this uber planner...but you guys are seasoned vets and know what you want to accomplish and what you want to go with the flow on.
I may need to check out the AK Bakery myself. Is it close by the Safari? My plans will be to head there right after RD as well.
Oh and TH breakfast was REALLY good. I actually hated giving that one up for June but I's rather try Sanaa on our AK day, so, even though it is a character meal, I think you will really enjoy it!