I would keep #2. Though perky can be nice, I don't think you want a tail THAT perky, or Jaunty, as on BYCer calls it. I don't like his comb either. I think it is smart to keep the better stock, you never know when someone may want to hatch some eggs and you should always try to improve what you have, even if you don't show them.
I don't think keeping 2 roos is a bad idea either for a couple of reasons: 1 will take the roll as dominant and do one part of the job, while the other should pick up the slack that is the roos job. and secondly, what if something were to happen to one, you still have a back up.
Good luck deciding.