After further consideration I have decided not to split the Horse Roles further. Nor will I add counter-charge and receiving-fire to the melee phases. Both changes, I feel, are complications that will detract from the game.
I will however rename Pistols to Cavalry, and may add a paragraph explaining my thoughts on these matters.