Don't take the engine out for no reason!! Just take the head off and have it checked to make sure it's flat and also that the block is flat. Get the head crack tested.....but first of all is get that pump changed....that's the next suspect item(assuming you still have your fans on constantly and it is still over heating regardless and when driving it???)