Bro I am myself owning Vitz. Previously I owned Passo, and trust me, even brand new locally assembled PKDM cars are a no match to 2-3 years old used JDM cars (provided they are non accidental and auction grade 4.5 and above)
Even if you wanna switch, then I would suggest to again go for JDM Vitz, Passo / Boon, or at max. Celerio / Cultus in PKDM cars (these all are hatchbacks). I won't suggest switching to Honda City in the current scenario as a wise decision.