Definitely pull the covers and check the guides. The whole front of the engine does not have to be torn down to replace the uppers and the tensioner guide. If you wait until you hear slapping/clattering the next sound you will hear is silence......... Oh, and find a new mechanic...