Yes you're right but basically being able to produce 17 KG at 20% purity a month, I mean going from 20% to weapons grade does not take very long.
Basically if the order was given to build a bomb as quickly as possible I'm absolutely certain that one bomb every month would be feasible. That's not even considering the 2000+ KG Iran already possesses, although most of it is less than 5% purity.
In any case Iran is very close. I would say that right now Iran is on the threshold of becoming a nuclear armed nation. With a new hardliner government probably incoming, the Americans will soon run out of time if they continue to play games.
If Iran has 2000kg at 5% purity, and it starts enriching it, I think it can get 80% purity but will not have 2000kg left. For it to get to perhaps 25kg at 80% it might deplete all of the 2000kg it has in stock.
So Iran will have serious problems in getting more stockpiles. That was the point of the JCPOA, and we know the west talks tough, only when iran is weak.
The sanctions will not be lifted. They will keep the status quo for as far into the future as I can see. when you come close to a bomb, they will start attacking. I don't see any other way.