For the near term you're right, but longer term it depends if the EUs plan to require user replaceable batteries gets ratified.

I still think that extending security patching is a good move.