I got better luck, didn't have to replace too many pieces. Must say major thanks to all of you here for the great advices. Here is a few things I replaced:
1. DiveRite Transplate harness > DiveRite basic harness, one of the best decision, so much simpler while getting the job done.
2. DiveRite basic harness webbing > H webbing. As much as I like the basic harness, I hate the DR webbing, too slopping, D-ring move around
3. Hollis DC2/212/Neo > Atomic T1x on long hose & HOG 2nd on bungee. One of the best decision.
4. Intova wide beam light > intova narrow beam > dorcy 220 > hollis LED5, finally a decent light for my usage.
The rest, I pretty much got it right the first time. SS BP, Oxycheq single wing, Halcyon Evolve double wing, LM 21W HID, DUI CF200, all so far so good.