By passenger volume, Haneda really is considerably bigger, but it's lower-price lower-margin customers, for whatever that's worth.
NRT is currently a 7 in the game, and it's definitely the largest 7, even by enplanements alone. After considering how heavily it's weighted towards long-range flights, I think there's a strong reason to up it to 8.