My understanding mostly matches what you said: one gene, called "muff beard" allows both muff and beard.
I am not sure about heterozygous vs. homozygous causing different sizes of muffs & beards. I have seen photos of birds that run counter to that, in both directions (heterozygotes with big...