Hey,
there is this Sapphire 6900XT Nitro + SE, that SE is the important part, as it has 2x8 pin and 1x6pin connectors and comes with a different PCB. (It is a bit taller with one extra phase on each size. Anyway, the PCB can be seen in the attachment.
ANy chance that there will be a compatible waterblock?