Now. Before the question gets brought up, because it will, there's lots of people who aren't sure of the distinction between Bisexual and Pansexual. Basically, so far as I can tell, there are two ways people seem to differentiate between them. Don't take this too literally, because at the end of the day, you are the only person who can define your sexuality.
A: Bisexuals see male/female romantic partners and appreciate them for their expression of their maleness/femaleness (whether it's fem, butch, etc), while pansexuals don't particularly care either way.
B: Pansexuality also covers the realm of transgender, intersex, androgynous, while bisexuality sticks to the male/female genders.
Again, these things are not concrete declarations, but rather just one perspective on the bisexual/pansexual conundrum. I invite you to do your own research to answer your own questions if you have them. The internet has a fuck-ton knowledge. Don't ask a question you can't google yourself, in other words.
So.. as a self-identified bisexual, I have to say I strongly disagree with the definitions you've given.
My view on this pansexual vs bisexual spiel is that these really are the same group of people. The difference is political rather than biological. You may on occasion find bisexuals who willingly agree to be placed in the box you've assigned for them, if they don't want to date transgender or intersex people. But... well look at it this way: gay and straight people willingly date transsexuals sometimes. We don't force them to change their label over it. If you're a straight guy who crushes on an mtf, you can identify as straight and nobody will bust your chops about it (unless they're a dumbass). So why does a bisexual have to change their label? It's an odd double standard. I'm attracted to men and women and a good number of things in between. I shouldn't have to define myself for my exceptions.
Bisexual is the more well known term. Theoretically I am pansexual, but I prefer to use the term that doesn't require explaining, and doesn't make me sound a bit like a pretentious jackass.
And on the subject of pretentious jackassery... there are a few things bisexuals and pansexuals do that fall squarely into that category. One is saying "being bi or pan means not caring about genitals" and acting as if that's a more evolved way of seeing your partners. Well... I do care about genitals--quite a lot actually. You could say I'm a fan, basically. There's a larger variety I may like compared to someone who's gay or straight but it's not ambivalence on my part, I just want the whole buffet. I'm not more enlightened than anyone else. I'm a primitive, instinct following animal just like anyone else. No open mindedness needed here.