Although you were at the edge of progress with poor gear as you say so your choices back then seems obvious: higher ilvl upgrades and let tiers pieces to dps.
Now we are already late into the tier so you can eventually take the "risk" to drop HCWF off pieces to lower tier pieces.
In the end it's personal choice: either a comfort tool (4pc) or passive def stats.
It's not bad to have different points of view. Up to every one to decide with full picture in mind.