That doesn't seem to be what the writers were going for... it's not all about Data's abilities. One of the first things Picard does after being freed is mention Riker's unorthodox plan. Not sure they would have made it without Shelby or Worf either. And without Picard's help he wouldn't have come up with the command..
If Data were with some other ship's crew at wolf 359, he probably would not have succeeded at bringing Picard back to even have the chance to examine a drone.
Heck they could easily tell the same story with Geordi figuring out a command with Picard's help instead of Data using some magic tech and still keep the spirit of the episode the same.
Yes, every episode could be potentially re-written to provide any hero to any storyline - whether it's Data, Troi, Riker, whomever. I agree it's really a team effort, but Picard tends to get the credit (which is understandable since he's captain). Data should get some of the spotlight, too, especially with the degree to which he sacrificed.