Adjust 11-30 to 11-20 or even 6-20, if you want to keep top20 for Light Party seasons.
Doesn't make sense to exclude them.