You got the room, if this as a trail rig and not a rock buggy go with a 22 gallon or bigger.
The side-saddle tanks are actually not in a bad location, but the filler necks are nutorious leakers. If you can or are going to retain them its good extra fuel, just buy some of the avalaible after-market filler necks and caps or feb your own, otherwise everytime you lean it over you'll be pissing fuel out.
Remove the side tanks and have them cleaned and sealed, or get the poly after-markets. Then use them as "spares" either directly plumbed in with a valve or put a little transfer pump in them to pump into the main tank.
Oh, and EFI that bitch. You'll be happy you did.