A partial solution is to build reactors that can use that waste. Thorium reactors can do that and have the advantage that you can't make a bomb from it and that it is easier to control.