Yeah that would be a better option as well as Buckle has done you can't put a price on experience. O'Driscoll would be another interesting choice i think as well.
You're clearly stirring the AP/Waigo situation. We just had better players to play ahead of him that worked better with the team. He was a great impact sub, when he started in the league he didn't make much impact.