The poll is now closed and looks like the vast majority of commenters preferred style B over style A. Personally, I'm kinda leaning towards style B too, so you're probably going to see more or less anatomically correct vaginas in my future works. Thanks to everyone for participating!
BTW, here are the exact results in case anyone's interested: Style A - 23.44% (15 votes) Style B - 68.75% (44 votes) Both - 7.81% (5 votes)