I’ve done the same thing. Local fresh cold water gets my Freedom plate with my HP100 and known weighting with my drysuit and undergarments. Travel warm salt water gets whatever is rented matched against my cheat sheet for known weighting combinations for different exposure suits and different gas cylinders.I gave up on the unified solution for warm and cold water setups. Got the DGX basic BP/W package for warm water and building a cold water setup one piece at a time around the Subgravity 6mm plate as I find things on sale or demos etc. Since it'll be an exclusive cold water setup, I see no scenario where I wouldn't need the extra 5 pounds somewhere on my body, so it might as well be distributed across the plate by design.