One more thing, for those who have Kolari/Leica body.
Simulation shows that combination of thin cover glass and plano-convex method would get even better result!
Astigmatism at Extreme Corner:
3m plano-convex \"SLB-50-3000PM\" in front of 21mm with 0.8mm cover glass: 0.11mm.