For paint modes I don't think we need much, I propose we just add Brush, Options and Grease Pencil tab. The actual brush settings and such are needed constantly, so they should not be separated from the actual brush panel. But the Options panel is seldom used.
A decision has been reached via the weekly Blender developers meeting. This will be committed soon.