I've been beating my head against this current measurement problem all night.
I was actually hoping the THG tester had found a clamp-on that might be able to do the job accurately, but considering that clamp on is a
hungarian made device with a maximum frequency spec of 1kHz, I doubt that's the case. You need something with reasonable accuracy up to about 2 MHz to have any confidence of accurate results.
It's looking to me, like the most practical means of getting reasonably accurate results, is a modified version of my second idea. (Shunts in series with the switching inductors.) I can design a little circuit that will put out a DC voltage proportional to the current draw. Let me think about how to do this...