PoE Superpithed, Physical builds

I'm running a formed farm and want to be able to run my own shaper when I stock up some invites. Currently running the splitting steel champ linked below and it is not handling regular shaper well. My one uber shaper attempt I didn't even get through phase one. I can't get gud so I want to throw money at the problem. Looking for suggestions to modify or upgrade current build or reroll something that could handle it while maintaining fair mapping ability. On top of current gear I have a MB and about 100 div budget with the ability to farm more. [