Are you sure it's not the pads shifting in the calipers. The pads shift fore and aft on their mounting pins a little and make a clunking sound which resonates through the fork legs and can sound like dodgy forks. My XTZ makes a noise from the calipers when you bounce it holding the front brake on. Try chocking the front wheel against a wall with a block of wood and bounce the front to rule out any clunking and clanking from the brake.

__________________