You are somewhat correct, but red-ray is also correct. There are technically only two variants. Just because the cable selection changes, doesn't mean it gets a new PID or even a new RPS part number, for that matter.
Also, there is no such thing as a H++ cable. The PCIe 5.1 spec only changed...