Believe it or not in some ways they are better and more flexible and in other ways they're more limited. Basically they are totally separate situations to the same problem.
Since they now have the same owner, you've already identified which one is gaining features and fixes.
Its hard, and this is a common issue. I have to stop and ask what good am I doing by avoiding it? Usually it's worth the price, because making the real world a better place out weighs most big tech issues.
At least that's how intrt to evaluate things, while still minimizing my own footprint where possible.