So he proposed a new one. After some discussion on IRC and sending some userinterface-mockup screenshots in both directions to each other we found this getting more or less the way we want it. Other screenshots here and here.
It's not a promise it will be available in that release. But chances are getting high.