My end goal has been, for several years, to become an aerospace engineer. Like you, I had aero offers in the UK but I chose to go to a school in the US where aero is not offered, so I will be majoring in mechanical engineering.
Coming from my dad, who has a master's in aerospace and a bachelor's in mechanical, an UG degree in mech engineering (can't really speak for civil) is virtually the same as one in aero (in terms of opportunities afterwards and classes taken). So if it were me I would go to Berkeley and if you like apply afterwards for a master's in aerospace.
Choosing Berkeley is definitely not going to abandon your goal of becoming an Aero engineer