Along the same lines, I would recommend the buffet breakfast at Boma followed by exploring the Animal Kingdom Lodge on the morning of your non-park day.
In terms of MNSSHP,
(1) Book FP+ for 3 rides at 4 pm, 5 pm and 6 pm,
(2) I prefer the earlier parade (even though the parade crowds are much...