Installed two Panasonic 18650PD cells in the "Weekender" this morning. Been vaping all day, including periods of 20w, no problems detected. This build, including the bat holder, with these PD bats, can handle 20w no problem!
Panasonic 18650PD Specifications:
Battery type: 18650 High Drain
Capacity: 2900mAh
Max Discharge (constant current): 10A
Max Discharge Pulse Current (5-6 sec.): 18A
Full charge: 4.2V
Charging method: CV/CC
Minimum charging current: 0.6A (Note, this is higher than the Evolve branded charger puts out, I used a 1A charger)
Rapid Charging current: 1.35A
So, 20w bottleneck solved.
The "Weekender" now weighs in at 5800mAh.