hi Matt,
my first thoughts are about stance.
i'm guessing that for a right hand on top, casting off the right shoulder, your right foot is behind the left ?
if so, try 'closing' your stance a bit by bringing your right foot forward a little. this hinders rotation and might help. (in the same way that we 'open' our stance to ease rotation)
i hope so !
cheers,
marc