Mike,
The calendar method shall be applied to determine extension of time but not for managing the schedule. What if you plan for some rain and assume it will be tomorrow but it does not rains, the schedule will misled people into not working tomorrow.
Critical Chain promotes the use of separate activities as buffers to avoid padding, which is an improvement, but is flawed with regard to feeding buffers because as soon as the critical chain changes they might no longer be feeding into the critical chain and if not enough new feeding chains will happen.
https://wafimohtaseb.com/2012/05/27/project-scheduling-best-practices/
A better approach is favored by Spider Team, it does not depend on padding, it does not use activities to represent buffer, no special software is needed to apply the concept.
http://www.spiderproject.com/images/img/pdf/Success%20Driven%20Project%20Management%20Paper.pdf
Best Regards,
Rafael