Something like P.G. Wodehouse?

I was lamenting last night that I had read pretty much all of Wodehouse's work, but really have a mood for a Jeeves and Wooster book.

Anyone have recommendations for writers who have a similar approach?

Things I like about Wodehouse:

– **creative use of language**

– light-hearted, amusing characters

– Jazz age silliness is preferred, but not a dealbreaker

– recurring characters are okay, but I'm less excited about a sustained series. Standalone books preferred

I recall some of Dave Barry's books feel this way, a little, and Kinky Friedman, and some Terry Pratchett, but nobody I've found hits the heights with language as PGW.

Thanks in advance!

ps – it doesn't really need to be historical fiction, but the forum requires flair and that's the closest I could get to what I'm asking.