I'm similar (though leaning to the more boyish end) and find tomboy femme works fine for me, but I know plenty of people who do the same and identify differently.
It all chalks up to terminology preference, I think.