Reckon you're spot on with those.

re the generator and pickups, the block with four white wires in is the genny, and the other is the pickups.

The HRC loom is all you should need, as it is designed to work on a race bike i.e. one with no lights.

Can't we tempt you to build a proper NSR with it?