I think that Will is right on here. The only thing I would change is to cut out 16U and add 6U and finish the season the week before HS State. We would still have folkstyle nationals to prepare for and freestyle/greco could start sooner. By cutting the season a month shorter we could increase the amount of athletes competing in freestyle/greco.
As far as moving state to Wichita...no brainer. It has to be done. Topeka is running out of space and Wichita is a much better choice.