Sounds like you're doing it right. And you're still pretty young, which helps.
As you get older, the strength gains will be harder to come by and you'll find yourself becoming a slave to your body just to maintain the gym performance routine. Then you might have to make a decision.
