As the "P" stands for personal itīs no surprise that everyone has at least one opinion on his / her kit (I have three different kits for different purposes). IMO your aproach is reasonable. Have fun when you assemble your kits.
_________________________
If it isnīt broken, it doesnīt have enough features yet.