How can I smooth edges but keep faces untouched?
While the best would be to find a topological solution, Shade Flat and Shade Smooth can also be applied on a per face basis in edit mode.  This can produce some strange results sometimes.