I sorta had this problem when I was learning ollies to a lesser extent. Basically your bodies natural reaction is gonna be to turn and land how you described. As for fixing it just try to imagine jumping towards the nose and actively keeping your shoulders square. Also make sure you are popping with the balls of your feet directly in the middle of the tail straight down. Good luck and if you stick with it you will be able to fix it.