Crank puller for sure. But from that point I'd get the bike shop to replace your present BB with a cartridge style. From there if you run into trouble again you only need the Shimano style spline socket to work on both sides. It's just that your present setup requires the hook spanner and pin wrench while the cartridge style only requires the spline socket and a 1/2 inch drive ratchet to operate it. Of course you STILL need the crank puller in either case.