I think the biggest suggestion I have here is to try to evoke flavor rather than the specific plot beats of the text you are working from. For me, I tried to use a number of plays to evoke Shakespearean comedy rather than cleaving really closely to just one. I’m trying to do the same thing with the novels of P.G. Wodehouse for the upcoming Tally Ho.