I would have thought about such a decision before buying a car - not afterwards!!!
If you are not happy with your GLi then I will recommend to go for CIVIC but spend a little more to find at-least 2010 model. CIVIC from 2009 onwards performs with much more economy and is free of most troubles - present in early models.....