If by "good guys" you mean champions of privacy, I don't think Apple will ever be that. They're a giant business and that means they're primarily motivated by profit.

It's up to the people to be the champions of privacy and help Apple realize that our interests (privacy) are aligned with their interests (profit).

(And I say this as someone who's rather anti-Apple for other reasons. Life is complicated and full of compromises.)