I need more information before I can answer the question.
I understand the terms, I have used them in the past, but I don't understand the specific definitions the OP is using and I don't really know what the implications would be.
For example, when I hear "tomboy" I think of a girl who's probably athletic rather than "thin" and who likes awesome shit (cars, good music, sport, games, fantasy/sci-fi books, adventure activities) and is "out-doors-y". But I also assume she has a feminine appearance (facial bone structure and body shape) and probably feminine mannerisms.
I wouldn't think of an androgynous woman, or a elite level, tanned up body builder with dinner plate hands, a five o'clock shadow, and an Adams apple which could poke out my eye.
I guess what I'm saying is that, to me, tomboy implies that someone has certain hobbies and interests, and nothing else. I know a girl who both models clothes and is a cheerleader (yes after high school) who has blonde highlights and cares about how she looks a fuck load (more than necessary), but I think of her as a tomboy because she loves hiking, camping, fishing and sport.