Sounds like you have done your homework and have appropriatly handled the situation well.
I believe you will have to rehome one of your roosters to achieve the peacefull flock you desire.
Happy may calm down after puberty, and/or the other rooster may become a terror himself after Happy...