It is not a dilemma. Priority belongs to the dependent clause (it is the entire dependent clause that is the object of 'like'): We must treat Ghandi like whoever we think he was. ('We think' is an inserted comment clause.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.