Swapped some stuff out and was kindly donated a chest ... Am i heading in the right direction ?
http://eu.battle.net/d3/en/profile/Snaggle-2277/hero/39728327
Nice chest that one, will be good until you get Akkhans etc.
Looking at your gear again I would:
See what you can do about getting replacement jewellery with sockets on for the new leg gems, they make a big difference when you level them up a bit. You want 2 gems, maybe 3 gems if you can manage it. Bane of the Trapped/Bane of the Powerful are both good for all specs. I like Mirinae too but especially for a holy spec.
Shoulders - Your shoulders are a bit rough, you still ideally want str/vita/(life % OR all res) and CDR % (can roll 8% CDR).
Helm - Not a bad choice, the sweep attack damage isn't doing much for you though here, the same again but with Crit % instead of Sweep attack would be ideal, and the 81% roll is low as it can roll up to 100% extra gem effect.
Amulet - Same as before, I wouldn't waste resource rolling this one more though really, try and find a better one so that you can add a socket to it.
Chest - Fine but maybe if you get some spare materials roll the fire % a bit higher to closer to 20%.
Gloves - Gamble for either Akkhans or Magefists in this slot, Magefists are good for fire spec, you will need Akkhans for later on.
Bracers - You still need some better ones, craft some Reapers wraps with Fire %, Str, Vita and Crit %. If you make the same but with Holy % instead keep em for a holy build when you get Akkhans set.
Ring 1 - The Avarice ring is pretty good for now, I wouldn't change anything there.
Ring 2 - The other ring should be replaced with one that has more offensive stats and a socket, or a RROG which you can get from bounty caches, you will want one anyway.
Belt - Reroll smite % to anything else here really, armor, regen, whatever.
Legs - Justice damage is a little bit of a waste of a stat considering how little damage Justice actually does compared to your hammers, have you tried dropping Justice for Shield Glare with the wrath return rune? You shouldn't need a generator ability at all with hammers as your only spender and unstoppable force.
Weapon - You still need a better one really, but I wouldn't waste materials on the one you have, it's an instant salvage for me when I find it.
Boots - fine for now and hammer damage is good for the spec.
Shield - gamble Kadala for a legendary shield of any description really to replace this junk shield.
Your profile says you have 610K HP, is that right? I reckon you have too much health if that's the case, you shouldn't need much more than 300-400K with focus then shifting to other stats that reduce damage taken or healing instead.
As someone wise once said the best form of defence if offence. The quicker you kill the less you need to take hits, this game does favour more damage, to a point anyway.