Ill look at the 01-05 civics as well. The yaris is now on my radar as well, espcially after seeing the coolness potential they have:
I guess its really a matter of test driving and seeing what i get out of the payoff value of the civic and trade in on the STi.