>>4444228
EF is a good choice for starters.
I'd switch the 16-35 for a 50/1.4 (Zeiss Planar if you can get a split prism focusing screen, otherwise Canon's own if you need AF). 24mm is generally wide enough for what you describe and you'd also want a fast standard lens for low light and family/friends stuff.