It's easier than this, the waste can be burned in the new generators.

So building more nuclear would actually fix the nuclear waste problem.