I have run more combats in more systems than I can count, and my one universal piece of advice to make them fun is: JUST KEEP ROLEPLAYING!
- Have the enemies talk shit, taunt, joke, monologue, confess!
- Ask how PCs feel! Why?
- Make actions emotion driven! Hatred! Fear! Jealousy! Envy! Love!