He could have been both, loads of Masons keep studying the catechisms until they have learned everything they can. Knights Templar is a rank in York Rite, and the 33rd degree in Scottish Rite is a ceremonial degree, usually one only achieves the 32nd degree.