Check your engine mounts again. I had the same clunking noise when I shifted gears and when revving up. It turned out that 2 of the bolts were sheared and the only way I found out was because I wanted to check shaft engine alignment when the nuts with 1/2 of bolts came off. Unscrew the top nuts a few turns of all 4 mounts.