In this situation, it's probably best to differentiate between the two with color—but you're right, it's silly to lose the already-established visual cues.

Colour is a terrible visual cue because colour perception is heavily relative to the viewer. Strong visual signposting is more apt (hence why playing with underlining should not be abused).

I like the flatness too, but still prefer roundrects. They'll never go out of style.