I dont find anything in Baboo. Even as an actor he is just useless. I understand his character is of that of a bad guy but then there are other people in the show who are supposedly negative.Bad characterization, bad acting, bad fashion sense all put together in one man.
Having said that, I think Abhimanyu still is a better choice. But will this happen ? With Rambachan still in hospital and Nimki lying about her in laws and Tettar losing his chance to become the MLA, Nimki will still be Haveli's bahu and will continue to live life like this.