I haven't had a problem with the WSO bezel assembly in the past. If you don't go for gen, I would go for a Yuki insert and either a Yuki or Athaya pearl. Yuki's is way overpriced but better finished, the Athaya pearl needs access plastic trimmed, it's just as good as Yuki's when done. While you are at Athaya they have decent 700 crowns too. Part links below:
WSO bezel assembly:
https://www.ebay.com/itm/BEZEL-INSERT-SPRING-RETAINING-OLD-ROLEX-SUBMARINER-5513-1680-S-STEEL-BLACK-/160658405953?hash=item2567fcba41
Yuki insert:
http://www.yukiwatch.com/catalog/item/9020785/10270361.htm
Athaya pearl:
http://parts.athayavintage.com/product/aftermarket-rolex-pearl-dot-pips/
Athaya 700 crown and tube:
http://parts.athayavintage.com/product/aftermarket-700-crown-and-tube/
Here’s a shot of the WSO bezel assembly on my 5517 with a T19 service crystal:
And the Yuki insert on my MBW 5513, also with WSO 580 endlinks and gen-spec 2mm springbars. Helenarou dial with re-worked lume, ETA 2846 movement with mixed handset (Clark & Rafflestime):