I took a sample of the offending batch of JBA to a BIER club meeting, and no one detected Diacetyl, so
I'm going to make another batch of JBA, no Whirlfloc (I'll use Irish Moss), or English Ale Yeast (I'll use US-05). I'll be using the normal grist, which includes rye & oats. It'll take a month or so to see how it goes. Thanks, All.