I don't think you were out of line at all. It's obvious that you and her have had a fun relationship in the past. She needs to know that is still there, right?
You played just enough, in my opinion. Didn't push things and actually made fun of the sitch. She played nicely back by saying touche. It actually makes her feel a little comfortable with the sitch. That way when you guys do talk about it, she won't feel as guarded or dreading the talk.
Next step? You're right. Let her do it. Don't avoid her but don't make yourself super available. It's tough because you are seeing forward progress. Just don't forget everything that got you here. I don't think you'll lose her by not reaching out to her. Believe me, she'll reach out again.
m 40 w 38 married 15 together 18 d11, d8 bomb 12/19/10 2nd bomb 3/30/11 COMPLETELY DONE