Instead of putting so much effort into keeping the internal combustion engine for cars they should push the fuel cell even more. The ICE for cars will in the long-term be abolished (mostly), I'm convinced.
And they should shift their focus from hydrogen to methanol, which is much less of a hassle to handle.