Plus one-grow both.
I agree with Jase; the MOAs have more of an annuum quality to their flavor profile. Still a danged good chile. I think TFMs are my top favorite yellow Bonnet, but I love the Foodarama/Beth Boyd and the Dreadies.
IMO, Bahama Goats are sorts similar to Bonnets on a lot of ways, but they don't quite fit the classic Yellow Jamaican Scotch Bonnet classification. I'm growing Goats this year as a supplement to my Bonnet project, but I'm not counting then among the Bonnets.
Ps- another classic, delicious, similarly Hab-level on terms of heat chile is the Yellow Fatalii. To me, that is a must-grow pepper. Heat is around the same, but the arc is way different from a Bonnet or Hab. Fataliis come out hot almost right away, whereas a Bonnet will build on ya. Bonus with the Fatalii is, the plants produced a shit ton of pods.