I did notice they addressed alot of my complaints when they did the new 500. I wonder if the tank and side panel would fit. Other wise I was looking into a fuel cell filler neck. The type that bolts onto the top. They do have a few different angles and lengths.