Indexing your paddle with a piece of rope and some tape will help line up your knuckles to your blade, if your blade is behind your knuckles when you set up to roll the paddle dives. If your paddle is ahead of your knuckles it will climb to the surface. Practice sculling strokes also, it will help you get a natural feel for if the paddle is climbing or diving.
this is all to help you line up your knuckles to your blade, agood hip snap is imperative, which it sound like you have.
also, i know you didn't ask but your head is important too, if you can finish looking in the direction you come up, you can turn it into a forward stroke and be ready for the next stroke.