Generic Active Probes
While not useful for all situations, I tend not to use active probes any more and instead use a resitive probe, which I learned about from Howard Johnston.  For all but very low level signals it works very well.

This will partially solve your issue.