Since you are diving off a boat, you can try Mares SuperChannel full foots. I've used them for years and they can provide a lot of power. Scuba Diving magazine used to do instrumented tests of fins and the SuperChannel full foots scored the highest speed and greatest thrust of any fin they ever tested. That included all the usual scuba fins mentioned on this thread, but notably does not include freediving fins.
Here's the slalom course test results from their big fin test of 2007 at
18 New Fins - Scuba Diving Magazine . Unlike the top speed and thrust test results, slalom test results are not comparable year over year, but this gives you an idea of just how good these fins are if you insist on fighting currents
"Slalom Course
Six test divers, using a flutter kick, followed a zig-zag course laid out in the sand in approximately 10 feet of water. While on the course, divers clutched either weight belts or BC straps to ensure all maneuvering power was generated by the fins. Divers swam two round-trip circuits per fin, recording their course times with digital stopwatches. The fastest time for each fin was taken from each diver, then averaged, to come up with the following course times.
Average Course Time (In Seconds)
Open-Heels
64 Apollo Sports Bio-Fin Pro C-Series
65 Aeris Mako
66 Atomic Aquatic Smoke on the Water
67 Oceanic Viper
Aqua Lung Blades 2 Flex
69 Oceanic Vortex V-8
Mares Quattro Excel
70 Mor-fin Natural Delfin
71 Mares Avanti Superchannel
72 Cressi-sub Reaction
Scubapro Twin Jet Max
74 Scubapro Kinetix
H2Odyssey Eclipse
75 APS Mantaray
77 Aquatec Duo-Vortex
Full-Foots
55 Mares Avanti Superchannel
59 Oceanic Caribe X
62 Mares Avanti Excel"