i vote singles as the others done way to much. But as a suggestion using singles match as base type, two suggestions for theme of the match.
1. Texas Bull Rope Match.
rules ... Staff, 1 Doc , 1 other staff of choice. both superstars connected to each other by bull rope ( example could use another thing i.e chains, leash, belt. ) win by standard singles i.e pin , knock out , submission.
2. Blind Fold match.
rules ... Staff 3 of superstars choice. both superstars blind folded. win by typical singles match pin , ko , submission.