Here's another supplier for an aftermarket tank.
Bonneville Shop out of Germany sells a 21 liter version called "slippery sam" and it will require (just like the NH tank) that you use something other than a stock seat with it. Tank is 790 euro and their seat is like another 260 euro.
