does it still count if you mix up the two requirements?

Yes. Feel free to choose the option that best fits you each day.