Oak Harbor Marina
Welcome David & Emma,
I second JRP suggestions, they are one of the best yards on the bay.
However, if you get sticker shock and/or prefer something a bit more North on the bay and a family operated marina, check out Oak Harbor Marina in Pasadena, Maryland. (about 30 minutes North of Annapolis and 15 minutes east of downtown Baltimore)
A DIY marina with lots of services nearby, as well as a West Marine and Cobe Marine for engine parts and service.
The marina is well protected and currently has two full time liveaboards.
They owner, as well as most of the yard staff are avid sailors.