http://us.battle.net/d3/en/profile/SofaKingKai-1805/hero/9999934

Thanks.

Definitely look to upgrade your gems across the board. If you get to a point where item upgrades are too expensive, you can get significant upgrades just through gems.

I'd say replace your amethysts for emeralds btw, 40k hp is way more than enough imo (you offset lower hp with higher resistances + faster killing + innate defensives)