1st gen echos sold in australia are the same as mine, and in japan is called vitz. if im not wrong, and my memory don't fails me, they renamed yaris to the new 2nd gen in all countries, but the vitz name in japan still remains (i confess i'm a yaris fan :P )
about the grille, i have the same front lights as yours, all 2007 south american versions have the same grille and headlight design. so don't worry about that.
here's a pic of the grille (only referential pic, not my car's grille)