Well done! I actually was following your progress and really like your approach :) And since yesterday I started my own habit forming routine very similar to yours.
And for that 2nd habit that you failed a few times you know what Rocky would say?

It ain't how hard you get hit :) It's how hard you can get hit and can keep moving forward!