Training wise it sounds pretty good. How my sessions are planned is by the main lift, not the actual area then I add assistance movements but it's far more practical to focus on the core lift of that session (military,deads, bench & squats) than to kill yourself on isolation/assistance.
I use it over again but my shoulder routine use to be so over the top, Press, x2 side raise movements,x2 front & a rear fly. Now all I do is a strict press.My strength & muscle has grown so much. Same as biceps, I actually don't touch them & yet they continue to grow. I just do the main things, pull/chin ups, db rowing ect
My days go Mon:Military Tue:Deadlift Wed off Thurs:Bench Fri:Squat weekend off.
Again as I always tell people you don't need to kill yourself to make gains, this actually has a reverse effect. You may handle it now but down the road you will hit a wall, small steady gains & a well thought out plan will be key.
As for diet (my biggest hatred) is for now just get this in check (which you clearly have) & listen to your body, not what a diet plan/fad diet tells you to do. I haven't counted a single calorie/macro. As long as you're eat well most of the time you will respond. People for some reason become obsessed with calories/macros, Unless you are cutting off fat for a show & need single digit body fat then live your life, enjoy lifting, eat & get stronger. I not fussed if I should eat a kiwi or an orange, I'll eat both covered in peanut butter.
I have gone from a light 64kg (142lb?) to 87kg(191lb) in less than a year & only now I cannot fit into my 30" jeans (my quads are to big im sure the waist would just about do up hahha)...It's ok to just look at how many calories you may need from time to time just in case you are under eating. Just follow the rule of a minimum of 1g protein per body pound. I know so many ripped, lean big guys who have no clue what macros even are.
I've read just about every diet out there & I came to the conclusion that most (take away what ever gimmick they are pushing) are the same at their core...Eat healthy food. I could write a diet book, make up some random fact & you can bet plenty of people would follow/believe it. Find what works for you
I personally work well off four decent sized meals a day. I tried the whole 6-8 small meals & it did nothing for me...