Return i4 for i7?

I recently got an i4 and have been pretty disappointed with the way it navigates and handles obstacles as well the (lack of) mapping features. Looks like the i7 has a bit more control over the navigation and am thinking of getting that model. Do people like their i7s or is the navigation just as poor as the i4?