My daughter is about the same age and we have the same issues. For Christmas we bought a minitrampoline with the safety handle bar. She loves it and it uses up a lot of that extra energy. Consider activity buckets to keep her out of the sink. Lay a shower curtain on the floor fill a dish pan with an inch of water (or dried beans) give her lots of little cups etc. A few suds in the pan are fun too. You can also do this as a wash station. A few small rags and a few waterproof toys or baby dolls are a lot of fun. Have a few towels ready! Good luck!