I can understand some of the reasoning for the April date. Battery lists is probably one of the main reasons, and also venue availability.
Perhaps a new rule needs proposing that the Indoor Finals run to the forthcoming years battery list
This would mean it could be brought forward a few weeks, back to the original 'March' date from years back.