Good luck. Identifying leaks is the first thing you need to do to improve your game... not just the first thing overall, but the first thing you do every single time you sit down to retool. Every good player should have a self-analysis like this once a month at least.

I can have the same problems as your first two above - which is my own fault for spending a solid month deliberately experimenting with LAgg play. Once you get hooked on it, it's hard to stop, or even take your foot off the gas a little bit. My recommendation is to just be more disciplined with your folding until you get back into better habits with starting hands. Choosing to call/raise/fold pre-flop can often be a habit, I think, and not something that you are putting a lot of careful thought into on a hand-by-hand basis. So slow it down and think about it again. 79o is not the same as 79 suited. Decent late position hands are not as good as decent UTG hands. Raising should be done for different reasons at passive or loose tables. Etc. You know all that of course, I'm just stating the things I think about when I'm trying hard to play a more disciplined game.

Also in conjunction with that, if you can't slow down all the way, switch to 6 max. If you can be just a bit more disciplined, but still play somewhat loose and fairly aggressive, you're on the right track for 6 max. Sometimes it's just a matter of finding the game that's right for your style, instead of trying to completely rebuild your style to match the game.