I was going to suggest that, but you sure have a lot of stuff in the way to do twice if you just take it out.
If you do take it out drive it on the hiway before making the decision, because it could still be the radiator or crap in the block causing it.