Lando Norris moved onto a third ERS unit at Suzuka, with McLaren looking to fix his previous component.