I think you are doing well. As you know, I've gone back and forth on the "friend zone" thing. Looking back, it's not a bad place to be. But there is a balance there. I think it is very good she recognizes the issue in the M and you are now showing her you have changed. The trick here is being the friend but also being mysterious and not always there for her.
Tough balance, I know.
BITS
Happiness is not something ready made. It comes from your own actions.