In all your projections, I'd use the full 2B authorized to calculate estimates until they put out their final numbers. Best to set expectations conservatively at the worst case scenario, then raise expectaions once the real numbers are updated.
We know the selling is over now, and will be till at least May 2007, if at all, so whatever the final OS numbers turn out to be, it will be that for a good long time now.