Looking for L.16 mage build

Hey! I am looking for a Level 16 mage build to fight Warriors and Rogues. I do well against them in team fights(well its team fight so why not) but when 1 on 1 I stand a chance against some rogues but not all, however any warrior just kills me. I use Expedition Rifle of Brutality, for armor and helm, I use ancient druid of brutality. I have a hard time picking ring as there is no INT/STR version and vice versa(I am not sure though) for amulet I use Tarlok of brutality.
Skills: Fire, Ice, Shield and Heal all with proper upgrades. I also used Curse, Light, Heal and Shield at one point but I sucked at it.
Any tips or strategies would be helpful