I'm sorry AF is showing up for you. But there's some good news here here. Your luteal phase was sufficient, so you know that's a problem you can rule out. YAY!
I think it's great that you are looking onward to a new cycle and making a plan for how to improve things with the coming month.
We'll all be here to help you navigate your way through it in any way we can.