I'd probably add Akuila Uate, Jharal Yow Yeh, Daly Cherry-Evans and maybe even Fifita and Bird off the bench, pending a speed/fitness test.
NZ would be Vatuvei, Inu, Hoffman, Johnson, Luke, Tuivasa-Sheck, Locke and I'd consider SBW, Kenny-Dowall, Winterstein, Whare and Tupou.