buddyglitch sounds like you have it well under control. If you can get hold of some, Nylog Blue on the o-rings, people umm-and-ahh about wehther it's necessary, but I used to occasionally find myself fighting slow o-ring leaks, and since using it, not one issue!