I'd take that in heart beat.
Castro is a solid play at a very weak position.
Do you have to give anything up for the keepers? or is it just a striaght keeper?
assuming its all equal I'd leave Zobrist... I don't think the regression will nearly as bad as everyone seems to believe with headley. He's a solid 25hr 15sb .280avg with Zobrist you're giving up .010avg and 5+hr for 5sb(which are easier to address) so extra sb and the now meaningles SS elig.(With castro now there for you) puts him out for me. Though it's still close.