I didn't do the maths, but 40 is very probable to still be able to run with a profit if nothing else is financed with it, witness nodes are relatively cheap. The difference from 20 to 21 is 80% though.
I'm always open to spreading the inflation wider, but I'm not sure creating a third "class" would be the answer.
Just wondering if it would encouragement more solid node operators.