I'm with taking it in for a proper rebuild. I see too oversights in the "cleaning" and other general details that make me suspicious of what else is lurking in there. I know when the person I take stuff to cleans blocks and heads, they probably look better than they did when they were in the factory. Bake cleaning and steel shot blasting.
