life, liberty and the pursuit of geekiness

I was so pleased that they didn't give Joan and John 21st century liberal attitudes because they were the good guys, like they didn't in the Dalek two-parter. I would have expected Martha's grumble to the TARDIS to have been 'Would have been that hard to find somewhere we both were inconspicuous?' or 'I can't stop him from doing the things he said not to listen because his era-appropriate attitudes mean he doesn't listen to a word I say' instead of 'He's fallen in love with someone else', because I am so tired of all the companions being in love with the Doctor. Before that it seemed like Martha and the Doctor liked and trusted each other, and she appreciated his trousers ;), which would have been a nice change from Rose if they'd kept it up. And she has a degree to get and a family to look after, which is reason enough for her to leave. Can we have a female companion who isn't motivated by romantic love now, please?