Wave 5 loved clay golem

Baal has been killed (360 mf total at kill)
And finally Emilio & Clay golem has Defeat the Mighty Baal. He spawned clone at about 3/4 life, kept running around him so didnt really slow me down any. But this was still a 25 minute battle.
Would love to find better gear from Nightmare before i move on, Any suggestions would be lovely !!!
I beleive the Fire golem is ready to retire and clay golem will take over, so i might go back to normal and respec to tanky clay golem when im ready to enter hell.
Items of interest :Bone armor (sol,um,um) or Vipermagi (spirit shroud is awesome ATM)
splendor necro head with some nice + skills (the +1 would be sufficient to replace the 1 i have with +1 skill +2 fire golem)
Obedience Polearm (seems to have alot of damage if i can go without insight) (clay golem is cheap compared to fire golem, lol)
Alot of my gear has been Magic Find setup from the get go. Maybe now that im going into hell soon its time to swap to some res/def gear.