OP, this is really long, which I apologize for, but I think you will find it worth reading.
You have a good base for sure and your lifts are respectable for your BW.
Diet-wise you don't look to be in a bad place, though the amount of cals required to gain/maintain weight can vary from person to person based on individual variations in biochemistry (genetics + environmental conditions) and activity level. The most base rule about diet is, though, adjust calories in accordance with changes in your weight (is it going in the direction I want it to at the rate I want it to?).
Don't get too hung up on weight, though, remember it's just one measuring tool in your kit. Also take into consideration your lifts, measurements, and what you look like in the mirror. Make sure you're focusing on recovery. This includes getting enough sleep and being reasonable about recreational drug use, including (and especially) alcohol.
As far as liquid calories go, they're no replacement for real food, but they can be useful. A protein shake post-WO and before bed wouldn't hurt. Just use regular whey isolate, no need to buy fancy weight gainers or any of that shit. For supps, just the basics: protein (not really a supp), creatine, a multi, joint health (fish oil and glucosamine).
You can throw in BCAAs intra-workout if you have the cash. Nothing fancy, and if money is a concern, forgo supplementation in favour of just buying more food.
I think your workout may be limiting you here. You have chosen a lot of good exercises that work all the main planes of movement (except horizontal pulling), but, I think you are at the level that you would benefit greatly from more structure in your training sessions. Looking into an intermediate strength program like Madcow, TM, or 5/3/1 might be worth a try (and STICK WITH IT, though that doesn't seem to be a problem for you).
I've only tried 5/3/1 (with BBB), which I really like so far, so that's the only one I can officially endorse, but I've consistently heard good things about the others from many of the posters here.
Do you still run a lot? Overdoing the cardio can screw with muscle growth, but moderate cardio is a good thing.
And lastly, if benching hurts your shoulder, have you ever given powerlifting-style benching a try? PL typically involves dynamic stretches of the joints worked and rotator-cuff exercises prior to benching. The style of benching is also a lot more shoulder-friendly. Just a thought, maybe it'll work.