Just remember, more power is good for bucking headwinds - you can overcome drag from windage because air is so much less dense than water.
Bucking currents at or over your hull speed can't (easily) be overcome with more power. This becomes less of a concern for longer displacement hulls, because they have a higher max hull speed. For a small boat with a 5 knot hull speed, it doesn't matter if you move the boat through still water at +5 knots, or move the water (current) past the stationary hull at +5 knots, more power will (mostly) just increase the bow and stern waves and very marginally increase speed.
Speed of a wave through the water is determined by wavelength. For a standard displacement hull, the wavelength can only ever max out based on waterline length, so the wave the boat creates can only go so fast. Really skinny hulls can go faster (for example, a Hobie 16 goes a heckuva lot faster than it's "theoretical" max hull speed, but it's not a typical displacement hull shape) and of course planing hulls are not bound by the physics of displacement hulls.