The problem with using preserved locomotives rather than new builds is the risk of breaking them by working them that hard, so the P2 would be the ideal candidate. Plus, you've got the 100th anniversary in about 13 years from now, so the other P2 project with the A4 like front might be done by then.