AP or ticket strategies??? Due to leap year

[WallE71]

We live in Kansas and are buying a gold AP this year since we are DVC for Spring Break or March 2019. My question is we planned on using the pass on our first day on March 18th,2019 but since 2020 is a leap year our passes then expire on March 17th,2020 so this makes it harder to use both Spring breaks. The 17th in 2020 is a Monday so we could use the weekend and the Monday next year. Does anyone have another hack to this other than just going to water parks on the Monday the 18th? Monday was our Epcot day and we had dining already planned. Single day pass just either way does not seem worth buying four single days to save a day on AP.