Just a thought: if you put your diffuse map into the luminosity slot as well, and increase the luminosity strength to 1, you'll get some sort of a flat shading. Is that what you mean?
As you can see in the image below, the second sphere still gets some shadow from the other sphere. You may increase the luminosity value to get rid of the shadow (not completely), but that of course influences the GI as well. Not perfect, but maybe a step into the right direction...