You could just reduce your overall volume a bit, so you have a higher ratio of grain to water. Instead of 21 litres, you could aim for 19 (which could be as little as 15 after yeast and hop trub losses).
You could also do a reiterated mash. Basically, split your larger grain bill in half...