All of the above advice is good but one thing was overlooked. With the engine NOT running shake the plane and listen for the clunk to rattle around in the tank. It could be that your clunk has fallen forward. I know, the nose up thing should show up the clunk forward syndrome. It could also be that the clunk is rubbing on the rear of the tank and not "clunking". Just some thoughts.

Good luck.