Quick update on the status of storage
Based on the newest video from Steve and Wendel, Gen 6 drives are not going to work in the m2 form factor. The max power for the connector will be exceeded, we're already pulling as much power as we can to power Gen 5 drives, Gen 6 won't work.
So it's quite likely Gen 6 PCIE SSDs will be moving to a new form factor. However that form factor and connection is not yet decided, in the video they go over some options but the one Wendel believes will be most suited is this thing:
Its connection can supply more power and due to its form factor it will be easier to cool, plus it can connect using a cable (and even long cables work flawlessly) so you can stick it anywhere in the case. Servers are now using these for Gen 5 and they've started doing Gen 6 testing on them too
Due to the larger size at 3.5, you can also stick more flash on it so these thing already come in up 30TB sizes and they run cool with no fans, no massive heatsinks