Oh, most definitely Q.

They would both do their best, but Yoda has the piece of mind that would endure Q’s antics.

While Q is a hot head that would get bored fast because none of their usual tricks can get through to Yoda.

I can see Yoda giggling when Q teleports away.