Mike
that you have consistent flat water in the morning, why not a Maas 27 or similar single? Not sure what you mean by "choppy", here at the Redwood City club it gets windy every afternoon and water gets bouncy/choppy with some protected areas. The club culture is to not take singles out on those times, but I consider it very rowable in singles, indeed talked a long time masters member to go out in afternoons to seek out the rough water.
OTOH, at the lake I have club at, the same sort of wind coming onshore would make it unrowable for a single because of the fetch.
No opinion on Bay 21 vs Maas 24, I think the Maas boat is a fine boat, and boats I've tried that are shaped like Bay 21 are fine too.