May the force be with you
One thing to consider when planning your training (because you plan your training, don't you?) is that is must (should) lead to improvements.
If your training does not help you to improve, what is the point of training altogether?
I will not tell you how to train because I don't know you and I don't know what is better for you, but I hope you know yourself and can find your weaknesses and need-to-improve points.
Here you can see me how I have improved from summer to winter:
I have been working on my confidence, specifically...