You can follow either the earlier or the later one, Insha'Allah, but you have to stick to the same all the time, year round. You can't change it on a daily, weekly, or monthly basis based on convenience.