The only reliable source is Sun. The CR18 is pretty standard and also a near perfect ERD match for most 590 rims seen on British 26" bikes.
I wish we could get the M13II in a 40 hole drilling, that would definitely allow more build flexibility with 622 and 630 wheels. Just not that many folks looking for 40 hole rims these days.
Phil