Yes, i agree, my way is a bit indirect... My next thought was to batch 1,000 runs to get some statistics and see what emerges from the noise ...I feel like I'm trying to find another higgs boson!
But, now that I've got mine working reasonably ok, I'll start studying your code and see what I can learn first.