Water bath is the answer, yes. Although... I personally like some singe and crackle in my cheesecake, which is practically the reason I prefer homemade, so I'd personally be more likely to go with covering up the cracks with topping.
I might also suggest a cake leveler, if you're in a rush or forgot the water bath and just want to evenly scrape it off...although, that would still need topping to cover up the saw marks. On the other hand, guests get a pretty-looking cake, and you can keep the good parts with the single and crackle for yourself later! It's like...having a cake and eating it too.