Jjay, Charlie sounds fab! Megan does something similar, first off she hates the bath! But any amount of over stimulation and she doesn't settle at all. Her favourite thing seems to be lying on Mummy and getting cuddles. Settles her down within a minute tops - every time.
The cuddles are fantastic but it definitely restricts what I can do around the house at times. Really must look into getting a sling, although I must admit I'm totally bambozzled by the options in slings!?! Which one have you gone for?