No, I am not sure that I am.

Photonic processing, whilst very cool and super exciting, is not a quantum thing... Maxwells equations are exceedingly classical.

As for the rest it's transistor design optimisation, enabled predominantly by materials science and ASMLs EUV tech I guess:), but still exploits the same underlying 'quantum 1.0' physics.

Spintronics (which could be what you mean by 2D) is for sure in-between (1.5?), leveraging spin for low energy compute.

Quantum 2.0 is systems exploiting entanglement and superposition - i.e. qubits in a QPU (and a few quantum sensing applications).