Hey Corbin, thanks for this nice review and pics you posted. You're right. PL-D is a bit longer than PL-C while it's a better step to remove the spring in the tailcap since it used to fall out often or get lost and caused some failures or shipping-backs.
I also agree with Rocket on the switch...