Yeah, it's tough to source, completely get it... There are some flat type C USB 3.1 gen 2 connectors out there, but they require custom ordering, which may put too much risk on your end, perhaps those that want it can source on their own.
Regarding the riser, I suspect Li-Heat and others are...