So reporting back on the bezel mod that has been recommended by
@KJ2020 , to add a washer and replace the click spring.
Extremely easy to do and it has now the gen-like click.
The shim that I got was quite thin so no sanding required.
Spring also works great and doesn't have as much back play as stock
Few pics of the process:
1. After bezel removal and spring removed
2. Stock bezel and spring
3. Replacement spring and washer from eBay seller Watchbandman50
4. New Spring installed, great click on it's own.
5. Bezel reinstalled - still loose
6. After adding the washer and reinstalling it all, very satisfied with the result.