Hi Karen,
Maybe keep going with Sheng Mai San for a while. It contains two adaptogens in high concentration, and also Rehmannia, which contains catalpol to help with cognition.
If that's not an option, consider giving a lot more Gui Pi Tang, or perhaps switching to Tian Wang Bu Xin Dan and giving that in higher amounts. Also, ensure the pre-blended formulas you're using contain Ginseng (Ren Shen), NOT Dang Shen, which won't work here. The TWBXD is theoretically more indicated, since the time of onset suggests potentially a Shao Yin (Heat?) pathogen. TWBXD is more cooling, whereas GPT is more heating, and thus potentially not a good idea for any Heart Fire due to Heart Blood or Yin deficiency, or a Heat pathogen. Additionally, TWBXD contains Sheng Mai San whereas GPT does not. Finally, TWBXD is a Kidney tonic (for the incontinence) whereas GPT is not.
Consider using Sang Piao Xiao San at the same time. It's mineral elements will probably be calming here, and it will probably help with the incontinence.
Hope that helps you out!
Steve