A couple of other thoughts--
For us, for several years we only went to Fantasmic at DL because we preferred it to WDW's version. We skipped it at WDW. That changed a little bit when they revamped it last year and got rid of the Peter Pan pirate ship portion. They did replace it with a POTC segment-- we just preferred the Peter Pan. That said--- DL's version still has a pirate ship section you won't see at WDW, and the dragon is alot more impressive at DL.
Also-- you said the fireworks are a must do. Be aware that when you do the Fantasmic dining package (for the first showing of Fantasmic if there are two), they do allow you to stay seated in the area to watch the fireworks, and they do the projections on the water also. It is not quite the same as watching it with a castle view-- BUT everytime we watch it with a castle view it always seems like at the last minute an extremely tall person, or a person holding an ipad or iphone over their head steps directly in front of me- so the times we have watched it from Main Street, I generally don't see that much anyway. That is a bit of a bonus with the Fantasmic package-- if you don't mind not seeing the castle. Also, I'm not sure how many nights you will be there, but I would suggest that you start trying to see the fireworks on the earliest night possible. We have been really surprised at how often they are cancelled due to wind (particularly when they are cancelled due to wind when we can not even feel the wind). I'm sure that is because it is a highly populated area, and I have also heard that the winds are stronger higher up there, even when you can't feel them at ground level-- but if their standards were applied in my state I don't think I would have seen 4th of July fireworks for my entire life. If our Fantasmic package is later in our trip, we will try to catch the fireworks earlier--- or at least I try and DH and DD whine about me making them be in the crowded area for the fireworks-- and then also catch them at Fantasmic. If our Fantasmic package is early in our trip, then we watch them there, and we might try to catch them with a castle view on a later night--- if DD and DH don't complain so much about me wanting to do it, that I finally give up.
Sorry about WOC --- we would always pick that one over Fantasmic. We aren't happy there are issues with it and the refurb is going to take longer either. That just means you will have to make another trip out West! At least you will have Paint the Night-- it is a great parade. My DH is not a parade fan and he loves it!