Sounds like things are going pretty well for you. I'm glad for you!
Being good friends is a required step to romance. So that is reason for celebration. But while friendship is a required step, it doesn't guarentee that W will move to the romance step. So celebrate your victories, but keep your expectations in check. Don't want you to set yourself up for a fall.
My thread, Carpe Diem #4 Orig Thread: Carpe Diem #1