After looking at the casting numbers again, I think it's either a 3558 or 3550- D 2
I'm going to order a CD version of the Green Book tonight, so I can find these numbers. Looks like a good reference. So if I understand right, a 21A 3548-A will work in my 36 with a correct bracket or re-drill...