I guess there is one more option. Replace your exhaust with 2-in-1 and replace the other rear can with a fuel tank. This should give you perhaps 5L extra fuel in a neat package. If you feel like it, you can even route it so that you don't have to manually fill the main tank from it.

That's what I would do anyway.