I was reading this as I'm having the same issue and thought of something (work around, not a fix);
Change the rule for your folders on your computer to put a copy in sub-folders only. That leaves them in main inbox and it's not the most tidy format but maybe we should rethink our inbox viewing...