Gender fluid? Or just more masculine than feminine?

Hi there,
I accepted my sexual orientation of bisexual around the age 13, although I didn't tell anyone for years. Although, sometimes I don't feel that the term bisexual describes exactly how I feel.
I knew from an early age that I was attracted to other females. I had my first crush on a boy years after all my friends (they thought it was odd but weren't mean about it). I didn't think anything of it at the time. What lead me to discover my bisexuality was that around the age when my peers started dating, I wasn't interested at first really. I did start dating a boy at age 13 and we were together until I was 15. He knew I was struggling with my sexual orientation but we didn't discuss it too much. After we broke up I was devastated. I now know that I put way too much of my own energy into that relationship. That's beside the point though. After that relationship I didn't date anyone until a year ago; I've been with my boyfriend for a little over a year now, we are going to college, have a place together, and are making future plans together. Before we started dating I was actually starting to consider that maybe I was a lesbian. I wasn't interested in anything sexual with males, but I did with females. I live in a small town and the opportunity to be with another female never came about. But I tried hooking up with males but I didn't go 'far' with them because it felt.. weird.
I've found that I am sexually more attracted to women than men. Although, if I have an emotional connection with someone, whether they be male or female, I'm sexually attracted to them. As with my boyfriend, I'm sexually, emotionally and physically attracted to him but wasn't at all with the males I experimented with hooking up with.
I don't really see gender as a boundary for who I may love or be attracted to, but if I were to walk into a room of strangers and pick out the one I find most attractive, it'd be a female no doubts.
I think my description of my sexual orientation falls under being bisexual, just leaning more towards being interested in females.
I've been confused about my gender identity on the other hand. It isn't something I let myself get overwhelmed over or anything, but having closure for myself is always nice. I was born female and I identify as female and always have. Although, I remember when I was a kid I was way more interested in boyish things like toy cars over barbies (I only played with barbies and such when my girl friends would come over to play). I was in girl scouts but really didn't like it. I wanted to be in boy scouts; I wanted to go camping, hiking, and make those cars that they race! I do like girly things though like accessories, make up, hair, and clothes. But I'm no where near being real girly, like frills and what have you. As I've gotten older I'm still this way. I love getting dirty, learning how to work on a car (I don't now much sadly, but I learned how to change my oil the other day!), or anything like that. Things that a girl might typically enjoy I often find boring.
I did go through a phase when I was around 12-14 that I liked to wear boy's clothing more. I'm not totally sure what it was about, I just found them comfortable. The biggest thing was that I liked to wear swimming trunks over a bikini (I still would but people think it's strange). I find it a lot more comfortable, and I like that my body isn't so exposed.
I have caught myself wishing I was a boy, but I think that's more based on my interests (like not being able to be in boy scouts because I'm a girl). I've never wanted a male body and I have no problem with having a female body. But in some way, I don't feel like a girl either. If you put me a room of strangers, I'd be much more comfortable in a male clique than female (although I tend to go towards females because it's "normal"). Hopefully this is a better example: I'm a waitress and in the restaurant the males are typically in back as cooks and females are waitresses. I'd much rather be in the back joking with the guys than trying to talk about things I'm not really interested in with the girls. I'm not sure why, but I typically don't automatically 'like' other females when I meet them. I think girls are sometimes annoying in the way the talk and gossip, just the overall way they present themselves bothers me. I've also noticed that my friends who are girls, are more masculine (they don't dress like boys, but they don't have annoying-for lack of a better word- personalities like girls).

I've very recently found the terms gender-bender and gender fluid. I don't feel like a boy or a girl (if I picked on it'd be a girl although); I think I feel more masculine than feminine I think. Would this be considered being gender fluid? Or am I just confusing myself here?

Thank you,
Shyv.