How do i prevent my two dogs from getting too wild?

So my parents have a 2 year old staffordshire terrier/ lab and she’s a sweet heart, but he can be wild and full of energy at times and we have to wait outside a pet store or dog park for her to settle down enough to where she’s not dragging us(she’ s got the strength of the terrier and looks of the lab). About a month ago, my mom decided our dog need a companion that could keep up with our dog so my mom went out and adopted a 12 week old border collie / lab puppy. We took our older dog with us to PetCo to meet the other dogs before we adopted one and she and this puppy got along from the moment they met however recently they have been wrestling each other a lot and biting each other. I know its all fun and they are just playing with each other and they let each other know when it’s too much, but they wrestle so much that afterwards they just become wild and full of energy. We are also training the puppy from being paper trained like his foster mom taught him to actually going outside in the yard and he’s doing well except he gets so wild sometimes he forgets and just goes in the house. Yesterday my puppy was so wild up that he bit me a couple a times, never enough to break skin, and my older dog followed suit by nipping at me like she wanted to play, The older dog has been like this before but not for a long time. My parents response to their bursts of energy is to get angry and yell at them and eventually everyone else in the household my dad is afraid my older dog is regressing and the puppy is picking up bad habits and are talking about separating them for a few weeks, like one in the crate for awhile and the other comes out to play and taking them outside one at a time. Anyone have any advice to A) settle my older dog down when outside, B)settle both dogs down or get them out of the phase of wild wrestling and C) prevent my older dogs regression. Please no advice about giving the dogs away or anything. It’s not going to happen!