Did Kanaya stay a rainbow-drinker even through the retcon?

Yes