I've had a Yaris and a corolla in the past and have recently driven the Hyundai i30 (hatch) through the Goget car share program a few times and feel that the Hyundai is MUCH better!
That said its not the the cw, but I would have thought they were comparable. The 130 felt smoother, more ground and heavy (safe) in a good way & a lot larger inside and more luxurious than any if the Toyotas I've driven before. I can't really comment on the fuel economy but the cw wagon in the dark grey/charcoal colour is the exact car I've been telling DH I want when we get pg.
I also like that for a wagon it's not enormous.
Good luck!
P.s can you please tell the price range of the discontinued model and which state you're in?