Keep going.
- Fix keyboard [check]
- Remove touchbar (or keep touchbar but also add back original function keys)
- Add MagSafe
- Add useful ports (USB-A, SD, HDMI)
- Add sufficient cooling
- Shrink touchpad to 2015 size
In other words, add TouchID to 2015 model, add some USB-C ports and upgrade internals.
It's pretty astonishing how a company like this can go backwards in so many ways.