Honestly, I love the stock tank's lines. The only things I dislike about it are: filler neck, seat/tank union and the pinched lower edge.
Given your investment in this bike, may I suggest you remove the stock neck and install a recessed cap (in fact, Jeff Stephens Asian Orange has something similar for example) cut off and extend the side panels to the bottom plates and get rid of those edges, and resolve the mount/cavity at the rear of the tank.
Do those things and you have a completely custom tank that to the average eye will look completely stock. But like everything else on your bike, its not. Not flashy, not ordinary, but discreet and extraordinary.