Good source of "correct" spokes for my 1951 ES2

Hello,   A local friend who laces wheels professionally tells me that he has had issues recently with spokes from CWC...spokes too long with threaded end disappearing too far into the nipple.

Granted, these were not ES2 spokes. But since I am about to place an order for rims, spokes and nipples, I am hoping that fellow members might have recommendations or advice on the best source?

Any input would be greatly appreciated.

Grant MacNeill in Ontario,  Canada