That is an excellent plan!
Another thing I intend to do at the end of the year, aside from choosing some habits to focus on, to reflect on what I did wrong in the past year.
I think it's essential to learn from previous mistakes to get things right the next time.
Motivation indeed comes and goes. If we were to only wait for it, we wouldn't achieve much...