Have you got to the bottom of your overheating problems yet? I'd take a guess that the oils got too hot and the rings have scored, making them thinner and thats where you're getting the piston slap. The only way to check is by measuring the ring gaps