For me, and I know I'll get hammered for this, but I would go to a drop away, like a QAD and get rid of the WB. Still full contain, but no contact. Otherwise I think your set up is fine, unless you are looking for a whole new rig. Have fun at the shop!