Let whoever you are singing for decide what your voice is called. That way you're never the guy to be 'voice typed' out without singing a note.
If you become a baritone, remember that we baritones are better thought of than our tenor brothers. Every stereotype is true.
Be glad and thankful for baritonehood.
"If my life weren't funny, it would just be true. And that would be unacceptable."
--Carrie Fisher