Hard to comment on without knowing exactly where the injury is and the weaknesses during any of the movements.
Your plan is likley fine.
I would add in some type of primary eccentric component on the hip flexors such as possibly leg raises while slowly lowering them to the ground if that hits the area. If you have access to ankle weights you can load it up.
On the other hand, it might be a good idea to work some wider or narrower squats, depending on your stance, to see if those can hit the areas you need to work on a bit better. Would probably have to back off of the load but we'll see.
As long as the soft tissue work and whatnot are helping you should keep continuing with that.
For the shoulder, work with some turkish get ups, potentially some regular RC exercises, and LYTPs