Yes I was thinking of CR 2 to begin with for a rider, so renaming the CR 4 version "champion" is good, and maybe giving it some bonus action/reaction in that case.
Maybe the CR 4 one is "Griffin Gallant"?
My idea for a wizardlike one was a mix of fighter and spellcaster - like a rune knight or...