IMO your diet seems fine as long as your meals are big. For training try something like this.
Train 3 days ABA BAB
Workout A
Squats 3x5
Strict press 3x5
Powercleans 5x3
Incline dumbbell press 3x8
Pull-ups 3x8
Workout B
Squats 3x5
Bench 3x5
Deadlift 1x5
Dips 3x8
Pull-ups 3x8
You will get strong doing that and get your beloved T-shirt muscles also.
Now if you want to stay lean you will also need to add in extra training 3 days a week so this could be sprinting, rugby, swimming, football, a fighting sport, circuit training, rock climbing etc
3 days weights will grow you muscle but the other stuff will keep you lean and athletic and yes you will grow.