There is an interesting new 6 GHz sampling scope that could potentially be useful for some of this work:
https://www.eevblog.com/forum/testgear/pocket-sized-6-ghz-1-...Haven't used it myself, but they seem to have a really solid customer support ethic, given the way the thread developed.
