My bike is also 04 so I quess that 42 is right then.

The calculator gave me the result and without any better knowledge I had no reason not to believe it.

Also installed the flush mount gas cap and the Pingel petcock (that gives the bike more fuel since it´s "high flow", right?).