Definitely Econ. You're going down the same path I am.
Design is one of those things you don't REALLY need a degree for. It's an intuitive process. If you love design then you'll be great with or without a degree in it.
Economics on the other hand is something you do need to study in order to...