The only reason one needs enriched uranium is because of political pressure from nuclear-armed countries to both force everyone to use reactors that require enrichment and take control of availability of enriched fuel.

NPT with annexes is already plenty enough to prevent hidden repurposing of waste into weapons, it just doesn't fit American immediate econopolitical wants.