Yes you have the correct map. 31012 is the "all markets unrestricted map"
You are only supposed to pull the headlight fuse. Nowhere on tuneecu for the new rockets does it say to pull fuel pump fuse or ignition fuse. The fuel pump will "ready" itself as you'll hear but it wont keep running as there is no need for fuel.
The ancillaries need to "prime" the bike in preparation for starting, which now makes the ECU accessible.
When you prime the bike, you'll hear the fuel pump and lots of quiet clicking and buzzing but that needs to happen, hence the reason to pull headlight fuse. Its during this period you now flash the bike. 20 minutes later and you'll be done.