Templar 1h/shield-Fire(scepter) need some help

Hi i'm trying the templar with one 1h+shield based on mace+elemental damage (fire based).
i need some help on progression.
my actual lvl is 52 with the follow passive tree:
60pt passive tree

my end tree.
86pt passive tree

this are my actual gear:



i will switch hatred with wrath.
at lvl55 i will switch to this shield:

i'm starting to have some difficulty with large group of mob and i have some problem with mana.
now i have a good regen but if i start to attack too fast the mana runs out.
what do you suggest for mana? with clarity+hatred i can't lvlup clatity.
this is because i will switch with wrath that will consume less mana and i can lvlup clarity a bit more.
what i can use for ale reflect monster? i'm using flame totem, it works for now and it have 350dps.

on future equip or upgrade?
for the equip my end-gear idea at the moment are Hrimnor's Resolve and Aegis Aurora
the weapont seems good. can it be viable at hight lvl too?

current stat:
my damage now is 1500dps without aura with infernal blow.
1050hp and 420es.
2500ar.

I wouldn't get Blood Magic and take mana regen instead, saves you a lot of passives and you can take closer fire damage passives too.

edited

update 1* post!