^ Yes. And it would have made a much better film that way. I know Picard had a personal connection with the Borg, and I also know that Patrick Stewart wanted to make sure that he was the center of attention.
But, let's face it. Picard is the history buff and the thinker. The character, as we knew him from TNG, would kill to have the opportunity to actually interact with one of the legendary figures from history and help him with his work. Riker, OTOH, was always the action guy, and him leading the charge on the Enterprise alongside Worf also makes perfect sense. And Riker, too, does have a personal history with the Borg and knows their tactics and their weaknesses.
Flipping the two can be forgiven in this case because of Picard's history with the Borg, but I still think it would have been a more effective film with the roles the way they were originally written.
And while action Picard worked in this film, to do it again in Insurrection and then again in Nemesis was overkill. Yes, we saw Picard do action in TNG. But episodes like "Starship Mine" were the exception, not the rule. We needed to see more of the thoughtful man we knew from the series.