Hi!
Yes, you calculated correctly.
For a 20mg/ml booster, 35 pieces are needed.
For an 18mg/ml booster, 40 pieces are needed.
Regarding shelf life, I recommend this article.