Torn between Engineering and Architecture?

I have a somewhat frustrating problem. I cant decide whether to get my degree in engineering (elec. or aerospace) ive always had a great deal of interest in aviation. But i started taking CAD and architcture cles my sopre year (ill be taking my third year of architecture as a senior in high school) and discovered i have a knack for architecture as well as a deep interest and appreciation for it. Being a senior I have to start submitting majors of intent for scholarships and keep on bouncing back and forth. Are there any degrees that fuse both engineering and architectural design?