Scott, congrats on the progress so far. I will mirror what everyone else has said, I would adjust training to focus on lean muscle gain now, then look to get down to single digit bf after you put on some solid mass.

__________________
I don't do this for my family, my friends, women, accolades, pride, or ego. I do it for me and no one else, its just part of who I am.