Shaun Johnson finds redemption with Kiwis