i always think it's best when a rivalry can't be settled by the kids, that the parents have a tag team match. use it as a fundraiser, bring in a special guest referee, have the kids coach each corner. i do like the whole "we're friends now" approach, keep your friends close and your enemies, i mean, rivals closer.