Forget about your swing. Don't even think about changing your hip rotation or your club face angle at the top of your swing.
That crap is NOT where you're going wrong. It's much more likely, and much easier to fix the stuff you're doing wrong before you even take the club back.
Focus on your pre-swing stuff forever...more or less...and I promise you'll improve like crazy.