Sam, I think that any kayak is going to be tough paddling upstream against generation, the only thing you might find that cuts through the water well enough to go upstream against generation is going to be a whitewater boat and even then you will have a problem. If going upstream against generation is a concern, then maybe you may want to look at an alternative. I have a friend that has a NuCanoe that has mounted a trolling motor on the back of it and another friend that has a Tarpon that has done the same thing. The only issue with mounting a trolling motor is you just picked up around 80 pounds and that means a lot to a kayak, don't care who makes it.
Alternatives, look at a 10 foot jon with a trolling motor, and you can get into one of those for around $850. But then you will need either a trailer or a pickup to haul it. I have a friend that went to this and prefers it over his kayak as it gives him more room in the boat and he claims that he can go in as shallow water with it as he did with his Ocean Kayak, and going back up stream is a piece of cake. 10' Tracker only weighs 80 pounds, 30 pound thrust motor is only $100, battery is around $69, boat is $554.