Nope. I'm keeping Wallace Huo as the heroic gentleman, if just to annoy you. I love my Qiao Zhen Yu, and I'm sure there will be a role suited for him in the sequel, but Wallace Huo is the better man for irritating you.
Besides, what kind of Wallace Huo fan are you, anyway? I would think you'd love to see him in a story. I mean, how often are you going to see Wallace Chung and Wallace Huo in the same story?