They need to fulfill current orders for 737 Max line. Then stop accepting new orders. They need to go back to the drawing board and completely redo 737 line even if it takes them 10 years to do it.
You are correct. Boeing also needs to bring their fit and finish and passenger comfort up to the level of Airbus.