Based on the information you've given I think you did great.
As you've pointed out, a northerly wind component against the stream can make for a rough ride. Also once you're in the stream you've got to get out of it. You can have a 5 knot current pushing you NE while you want to go W or NW . Makes for interesting current sailing.
The other thing about the stream are the eddies, you can hit one that spins off in a southerly direction.
Sounds like a nice sail!