It basically depends upon your interest. In my opinion ,go for what you are most interested in. In my experience, architects spend their days on drawing buildings on big sheets( you could use a software package these days); whereas, civil engineers turn those drawings into realities. Civil engineering is a broad field with research areas in transportation engineering, structural engineering, environment engineering, hydraulics and geomatics engineering.