Didn't have any troubles with mana, but I was playing MMMMP.
Just sit and drink between every dwarf, you will have like some seconds.
With tank should be even easier, you can sit and drink with your mages and start to tank with warrior, I had to start fight as new dwarf comes, you have not, you can continue drinking and tank with warrior and then start damage when you feel fine with mana.