Need help with oily skin problems

For context, I’m 38 MtF and been trying to figure out life before starting HRT. I understand that once in HRT that my skin will become softer and much less oily, which I’m stoked out.. but after years of shaving in certain areas like my chest,back and thighs, I have some very unsightly scars and brown spots under the skin (especially in my inner thighs) where I’ve broken out after shaving and then sweated at work (firefighter). When I look down in my genital area and inner thighs it causes MAJOR dysphoria from all the scarring and under the skin grossness. Will HRT help clear a lot of that up by stopping the oil glands or am I doomed to have shitty ugly bumps under the skin forever?