Pyramid Warden helps the deck a lot, it is playable without it but there are better decks to run then. PW works as a buff target, protect your 1-drops, frontline to play around Shaped Blast, just big stats for trading, and deception doesn't have many good 2 drops. PW doesn't have any good replacement, phase crawler could work.
Eiko is great when she works but isn't necessary. Relic removal that isn't bad stats is worth it. She gets around frontlines too. Trapper is fine if you need relic removal, its a flexible slot, I probably just put anything here.
Avatar of Deception is fine as any 4-drop. The sleep comes up every now and then.
Safeguard was a big reason I wanted two shivs, protected stopping 4+ damage felt so bad.