D, sounds like you're doing awesome, nice work! My dad was an extreme narcissist. I (like you) did not really realize what one was or identify him as such until coming here and doing all of the research that this path led me on. I also recognized some of those traits in myself and have largely removed them. I still have to gutcheck myself now and then, but just being aware of the issues does help us to address them. I think that's the biggest difference between a narcissist and a "nice guy" is the nice guy is willing to change and is often unaware of the harm their behavior causes until they learn more about it, whereas a narcissist just thinks they are right and the world is wrong and the world needs to bend to their will. I am not aware of a hardcore narcissist ever changing and I've known a few!
Keep up the great work at the gym and loosening up with people!