For what you are doing, I would go with either a genuine a Sinadder (if you can find one), or the the Sinadalizer from the UK, which is pretty much a clone of that circuit.
I have an original Sinadder 3 here, and I prefer to use it over the built in Sinad measurement in my Marconi and HP test...