Dan Gibson once bubbled...
I disagree. In a completely horizontal position (includes legs) a diver has no propulsion. A flutter kick results in the fin leaving the slipstream and there is propulsion in one direction and drag in the other. The most efficient kick is a frog kick. The kick is entirely in the slipstream if done properly. The slip stream does not follow the exact contour of the divers body. It spread out as it passes the divers head. Your hands, head and shoulders break the water and everything else should follow.
I'm not sure alternate D-rings is a good idea. Why change your gear setup in the middle of a dive. I know exactly where my gear is and how to remove and restow it. It's a muscle memory thing. If you change it, you just throw one more curve ball that isn't necessary. Make the adjustment with your body and not your gear. I also don't get in the habit of using my drysuit to fly me. Just enough to take the squeeze off. I certainly don't want extra air in the form of a bubble that can move around, not to mention that my body has to try an heat the excess air.
Now if the current is really strong, why would you be trying to swim with all this stuff on against it. Maybe a scooter (assuming one is proficient in its use and has access) would be appropriate in this case. If not, maybe the dive shouldn't be done.