You did the right thing. And sometimes that's really hard, especially when you've paid a lot of money and travelled to a place you might never get back to again. But it's still the right thing. I've been in that situation several times ... twice on dives I really wanted to do, and will probably never get the opportunity to try again. But I don't regret the decision to call the dive ... no dive is worth dying for.
The symptoms you describe are the result of CO2 buildup, and once that occurs the only way to resolve it is to slow down and relax for a few moments to let your body slow down the production of CO2 while your breathing reduces the levels already in your system. This is very difficult to do in a current without having something to hold onto while you let your body relax and your breathing slow down.
As for your buddies, they should NOT have signaled OK, given what you described. A lot of divers ... particularly newer divers ... put too much emphasis on continuing a dive when they know they shouldn't, because they don't want to ruin everyone else's good time. Whenever I'm taking a newer diver into conditions I feel will challenge them I always tell them not to worry about calling the dive if they aren't comfortable continuing. Don't worry about "ruining" someone else's dive ... think how ruined it will be if you put them in a situation where they have to intervene in your rescue ... or worse, your body recovery. I've known people on both ends of those scenarios, and the impacts can last a lifetime, even for the rescuers. So you should never push it.
Bottom line ... good on you for showing good judgment. No good diver will ever fault you for calling a dive when it doesn't feel right to continue ...
... Bob (Grateful Diver)