Yes, he did have to remove the motor to get to the tensioner screw. I will update this thread tomorrow once I’ve tried the bike out.
I now think the noise is only present when the motor gets warm (around 37 C). When I first got to Berkshire Cycles there was no noise, so I took it for a ride to...