TouchID was conclusively better for me. No question. I enter my password 30% of the time now (FaceID is about 70% accurate on my face). TouchID only failed when my fingers were wet.
Apple will not go back on this. FaceID is the future, love it or hate it. I just hope the future versions will be more accurate.
Maybe a more detailed calibration process. I always felt that the two rotations didn’t seem like enough.
For the first iteration of Face ID, I didn't expected to be perfect and flawless. I don't think touch ID was either, But they both had their advantages and disadvantages. But like you said, Face ID is their future and Apple believes that. It's just a matter of the maturity of Face ID from this point forward and what changes do they make to better the user experience.