My son and I use the baby stuff still it is some of the few products that do not have preservatives and other ingrediants that we are allergic too. You don't have to swap, but you should be able to now as long as your son doesn't have eye irritant issues do to lack of closing them against the soap.
If we learn by our mistakes, I am working on one hell of an education.
I still use the disposable baby wash clothes with soap in them. The huggies ones smell really good. And baby soap/shampoo when we travel 'cuz they come in convenient travel sizes. At home we have to use kids, tear free shampoo 'cuz ds saw some of the big kids using it after swimming lessons.
On a side note, I purchased some gerber Giggles baby wash for myself. It smells really yummy and I'm considering getting myself some of the Huggies Cucumber scented wash.