Fixing key#1 will really be your priority and probably for a while.. I'm still working I. It for 4.5 months now because it is so critical to making good contact.. Trust me that lean isn't the answer to pure contact as that will go away and you'll be back to square one looking for the answer.
Practice turning while keeping the same shoulder angle infront of a mirror and then compare to your real swing!
Also I still recommend the guys in evolvr when you are ready for the next step in playing really good golf.