I think Goldbach (while cool) would be a step back in significance from Riemann.
The obvious step up is P vs NP.