Based on what you said and how you said it, I think you need to look at the swing as a developmental step by step. Don't try to incorporate too many things at once. Like Will said, power is the last thing you want to worry about.
With proper mechanics, most people find that generating power is a natural step up to their foundational swing mechanics. No changes, just a little more of this and that. Little more coil, little more racquet head speed, little more takeback/loop, stepping in to the shot better, etc. You should seek to add power from these elements when you have mastered the fundamental use of them. Otherwise you get ugly overhitting syndrome. People ditching their proper mechanics to forcibly overwork one aspect purely for power, like hip rotation or wrist snap.