After puberty, do you regain high notes?

I'm a musician and part of a choir. In choir I am a baritone, because some of the tenor notes are too high for me. After I go through this dreadful phase of puberty, will I not have as hard of a time singing these high notes?