Yes, their both problematic but the biology path is an attempt at an excuse -- it's not my fault I'm queer! don't hit me! -- which, looking at human history has never been particularly succesful. Rather, IMO, the need is to remove the bigotry that says it matters, one way or the other, whether its a choice or not.

IMO, teaching people that it's not okay to bash queers -- biological or not -- is a better, more permanent solution than everyone looking for the magic, it's not my fault button.