Had basically the same thing with my jeep. Turn off, coolant boiling out of the radiator into the overflow. Replaced the cap, sprung a leak from the water pump. Ended up replacing the waterpump/thermostat. I just used a basic rotary cleaning tool for the mating surfaces on the block and...