Yes, square the clubface to the target line but setup with the clubhead about 4-5 inches behind the ball. Straightening your right arm will also help in lessening spine tilt.

Experiment with lining up the
- clubface heel with the ball
- clubface center with the ball
- clubface toe with the ball
(again in small increments)

Allow for a synchronized hip turn on the downswing but keep your head position steady.

Since you'll be hitting on the upswing, experiment with higher tee heights.

Keep your grip pressure light throughout your swing.