I am sorry to stress you

- its just what I experienced and I basically told myself not to go through China again if I can avoid it.
Now if you lay low, I believe it will all be fine. If you cannot change flights now - or if that is expensive now - I would advise you to really make an effort to not stick out at the security check. They do not have those "porn scanners" the TSA has, so they just rely on metal detectors and pat-downs. Make sure you have no metal on your body or clothes - no jewelry, earrings, fingerrings, piercings. If you use some device to deal with whats between your legs, make sure its metal-free. No belts either. Leave all your medication in the main luggage unless you really need it during the flight.
The items that caught their attention in my case was the inhaler, the hormone gel, a bag with 5 or 6 different pill packages (anti cough medication, hormones, thyroid pills,...), the charging station for my cellphone (battery pack) and of course my Laptop eventually (after the other stuff was already out).
I think they run the battery pack four times through the scanner and I had to explain all the pills to them, I demonstrated application of the gel eventually, but among the first things they did was to strip me down to the underwear in a separate room with a female officer in it. I did not have to undress my underwear though. The chinese woman apologized about 100 times for having to do this. Some of the guys were also uncomfortable, but apparently one of the guys who was in charge thought this is needed.
So again, maybe I am paranoid but I would travel lightly and be prepared.
On my way back, I just did bring everything I had on the flight to Korea , but I had printouts describing in chinese what the inhalator is and I had Jessies Phone Number ready so they could call her if questions come up and they could maybe communicate in some language ... Apparently they made a note about us though and at the security check they did not even ask one thing... or maybe that first incident was just a fluke.
Most people just passed the security check without any question, so I think by avoiding anything that can be interpreted as suspicious one can pass safely.