For economy and comfort I would go for the 2.5i. And I have the 5th gen wagon, and there's space enough for a grown man in the backseat - even if a well-developed person is in the front seat.
I'm still waiting for the diesel with CVT - I will at least take a test drive to see what it's like.