I've been working on this for a while, mainly because final render times are now in the order of days (thanks to my incompetence with the volume caustics) and I think it needs fresh (and better) eyes at this point.
I think the caustics and DOF still need to be different but I'm not sure how they should be different and it takes too long to render to continue changing things at random.