hmm, yeah - something like that.
It is hard to predict - MoneySupply is now 2.7 mill at block 6249, we be lucky to get 5 or 6 imo, but the last super-blocks is around the corner, so who knows...

The rest of the coins will take many many years to be produced.