It would have to be Best Play and Best Production of a Play. The first would be awarded to the playwright and be for the actual play itself, the text. The second would go to the producers for the entire production of a play. I can definitely see how those two award might go to different productions some years.
You could even combine Best Production of a Play with Best Revival of a Play, since those would cover mostly the same elements and allow for the merits of the productions to be evaluated regardless of whether the text is brand new or not.