How many adderall were you planning to bring? If it's not hundreds don't worry about it. Just pack it in a seperate bag with your other toiletries(shampoo, toothpaste, etc.) Throw in a bottle of vitamins too. On the slim chance that anyone actually does look they'll just think it's your personal shit and won't even blink.

I go to China quite a bit and I always stock up on drugs that would need a prescrition here in the states but I can get over the counter here. The last time I came back I got my bag checked and no one questioned the shitload of drugs I had. The bastards confiscated my bbq pork jerky though.

As for bringing weed back, why bother?