Hi Melanie,
That is a hard choice, but I have to say that i like the way you have your schedule now and I personally would not change it. Our family does typically avoid the Disney park with Extra Magic Hours as it tends to get very crowded throughout the day.
I like to use
www.touringplans.com when i try to plan our Disney World trips. the site uses a number of factors like past attendance, holiday and special events to rate the expected crowd attendance on a scale of one (smallest crowds & shortest waits) to ten. The site also recommends the parks that are the best to avoid on any given day. Comparing your original schedule against the Touring Plans recommendations & my personal experience with Magic hours, I think you haver a great plan in place.
Now that being said, it would be a shame to miss Fantasmic. it is an amazing and unique show and one of our favorites. An option I would suggest is to get an early start at Animal Kingdom on the 22nd and enjoy the park. We are usually able to complete our must do list at Animal Kingdom in less than a day, especially if we are there when the park opens. You should still have time to head over to Hollywood Studios and get in line for Fantasmic. The park will most likely be crowded so do not plan on visiting the attractions or shows until the next day, but just enjoy the show.
If you are enjoying your time at Animal Kingdom or do not feel like heading over to hollywood Studios, no worries, as much as we love Fantasmic, I have found it is better to operate on a schedule that makes the entire trip more fun and not to sway from that plan for just one show or attraction. there is always next time!