Have you ever thought about using a second Comfort Zone? Your macro definitely has space for it, and it's 14 free CP (almost as much as you save by leaving out the second PbP...)