Just a heads up with the grapefruit zest. It will impart a very bitter flavor for a good month or so after it has been carbed. It usually dissipates a little, but a little goes a long way so don't over do it. as far as your dry hopping issue goes, I would just dry hop the whole batch then rack...