The divemaster did screw up, because he missed the site and that caused the group to have to return (against the current) to the wreck.
Just a note . . . the DM may not have screwed up. Putting the group on the wreck in current is as much a responsibility of the captain as it is the DM. If they were dropped too close to the site and the water was moving faster than expected, it may have been virtually impossible to get down fast enough to hit the wreck, especially if anyone in the group had troubles descending. I was very impressed with the skill of the captains in Florida, where we did a bunch of wreck dives in current, at estimating where to drop us to have us end up just upcurrent from the target, but it was easy to see how mistakes could be made.
To the OP -- you had a scary experience, and an annoying one. You wanted to dive a wreck and didn't make the target. That happens, in wreck diving! Where you were, it was current; where we are, it's visibility. You can go down the anchor line and discover you just can't FIND the wreck, because the anchor or shot didn't drop close enough to it. It's part of the world of diving.
Once you realized you were blown off (and I assume there was nothing else to see) you made the correct call to abort the dive, but your buddy should have been with you and should have made that ascent with you. I think everybody else has already talked about the lessons there, about discussing buddy procedures before getting in the water, especially if you know there are conditions like current or reduced visibility that may increase the risk of having to end a dive early. In addition, I think you've probably learned that boat diving, especially in current, really requires safety signaling equipment -- being dependent on the DM or ANYBODY else for your ability to be found is a really bad idea.
As again already mentioned, you were only two of a whole group of divers -- did you want the whole group to abort their dive to ascend with you? Once you are on your way to the surface, you are really much more the responsibility of the boat crew, and it sounds as though they found you, which is what they are supposed to do. I have spent my share of time bobbing on the surface, hoping the boat was coming back . . . it isn't a fun place to be, but so far, they've always reappeared.
I think the offer of a free dive with them was a nice gesture, and an acknowledgment that their execution of the dive failed to put you on the wreck you expected to see. I wouldn't expect anything more.