Yes, it's time that you put yourself first. You've put up w/a lot over the last year and he's going to be at this for a very long time.
No, you aren't going up in a puff of smoke and disappear, but you are moving forward and leaving the door ajar. If and when he gets himself together, he can run to catch up and win you back or who knows...you may have moved on to other things and do not want him back. That is in the future and none of us knows what the future holds.
I think you are on the right track. Keep up the good work and yes, working on you and what you need to do to make yourself happy and productive in this world.
Sit quietly, the answers will reveal themselves when you least expect them to. The past is gone, the present is a gift and you need to focus on today, allow the future to reveal itself when it is ready.