Ok, well I started to do a sample for you keeping things roughly the same as you had them (using date math to pick the next one), but if you have ever shifting requirements like this it doesn't make much sense to do things that way.

I will reply soon with a calendar table solution.