As long as you didn't already have something special planned with her that night (this could include an agreed upon "just you and me" night) and especially if you'll also see her plenty over the weekend, then just do your thing and let her throw her fit. Really feminine women tend to pull stunts like this often in my experience- I've dated both, very feminine girls (my current gf is) and girls who acted more like guys. The 2nd category was much easier to always get along with, however I'm just much more attracted to feminine women, and I've also been told that I have next to no feminine qualities, so the old "opposites attract" idea might be why.
You can always check this site out as well, some of it's over the top but it has some relevant articles:
Masculine Power Development, Spirituality, Self-improvement, & Dating Advice at Yang Town
Edit: on the 2nd paragraph of yours, that's more something you'd have to decide yourself (IMO) since only you know what you're feeling like in regard to it... I've had the most fun to date in relationships once I dropped the idea of ever wanting to marry, although women tend to dislike that (my current gf sure does)...