The April week you went this year was near the end of spring break, even with Easter so late this year. When Easter is so late, the spring break season lasts a lot longer. Easter will be the first Sunday of April next year, so by the last week of April most of the spring break crowds should be gone. The 2nd week of June, the So Cal Select AP will be blocked until mid August. Since Disney no longer sells the So Cal AP, we don't know how that will impact those days. Those who already have that pass can still renew. The grads impacted the crowds more this year than I have ever experienced before. Since next year is the 60th, I doubt you will have to deal with very many, if any, ride refurbishments. I think that's one of the reasons there's been so many this year--to prepare for the 60th. The weather will be much nicer at either of these times than the end of summer. In June you get the evening shows (FW and F!) every night, so it's easier to schedule and make sure you get to see them because if you only have one chance to see the FW and the winds end up being too intense, you won't be able to see them because they'll be cancelled. If you go in June on a grad night avoid DL between 11 am and 6 pm to 8 pm. The grads get a full day park hopper, so they tend to arrive around 11 and go to DL because they'll have all night for DCA. The ride closures really impacted lines this year in a crazy way, but that shouldn't be the case next year. Sorry I can't really give you a recommendation. It really depends so much on what is the most important to you. I hope the info was somewhat helpful in your decision. Watch how the Sunday crowds are over the next year. Decreasing the Sunday crowds was the reason Disney gave for stopping the selling of So Cal AP. If those crowds start to do down, that means there are less of those AP, that could mean that time in June would be much less crowded.
