I can't believe the tank is the only thing holding you back if the bike is that good. I doubt any other tank will work. They probably stuffed all the EFI electronics in part of it like the EFI America tank. That would probably be the only tank that had a chance to work, and it's ugly too. I bet a custom bike builder could fab you one up from scratch to fit the bike for a couple grand.