Help needed: Swing training drills

Hi all!
I have identified two severe flaws in my swing but I haven´t found any good training drills to help work them out of my muscle memory. So I am looking for some good ideas. Please help me out!

Flaw # 1
In the back swing, at full rotation of the shoulders, the hips tend to rotate too much, thus decreasing the torque built up. Apart from reducing club head speed in the down swing I think this also affects balance. I guess this is mainly a strength and consiousness thing, but I surely would like a drill to help get going…

Flaw # 2
This is a common one. On the top of the back swing there is a very nice L-shape formed by the arms and the club. To create maximum power in the downswing this L-shape, as we all know, should be retained as long as possible. But already at 9 o'clock position my club has started to release. Again, anyone know of a drill which helps to retain the L-shape longer?

Any help on these two would be greatly appreciated!
Happy 09 season to all!

post removed

Thanks golfinguy!
Turning in the right foot in really helps to restrict the hip rotation and by that creating a bigger turn between hips and shoulder. This is obvious even if I have just tried it in my livingroom (winter has come to Sweden...) Don´t really know the term x-factor, but what I was referring to is the latent energy stored in the turn, which I guess is most efficiently built up and delivered if there is a equally distributed turn from feet, knees, hips and shoulders. Well, the right foot tip was exactly what I was looking for. Thanks!

The #2 flaw is maybe trickier, no quick fix to such a complex issue. I will however try the things you suggested as soon as the weather allows an hour or two on the range.

Again, Thanks!

post removed