Hello everyone,
I hope not to jynx it... But after a week, I am here to report that our lil pup is behaving a lot better with more sleep.
When she starts to get over exited around 6-7pm, the bad kind, we simply bring her to her pen, and she will gladly go to sleep in her pen. When it is too much, and it doesnt work (happened twice), we put her in her crate, with a blanket over it so she cannot see us. This will put her to sleep in a couple of minutes too.
So... Yay! Thanks!