If you always get your general into trouble, make him a normal infantry unit and keep him in the second line till you need him. Inf is better in melee combat then cav