Dear PaulMM.
2.000 kg of Jet A1 fuel correspond to 2.469 liters, you can put almost 2.000 liters in those wings and the rest in the fuselage. The A-4 Skyhawk has similar size and has 2.120 liters in the wings and 908 litres in the fuselage.
I think the wing has a good geometry, please consult: 'F-16 Design Origins' Code One on Loockheed Martin web site, see the wing chapter.
The aircraft would have a lot of thrust for the given weight, there is no need of area rule to overcome shock wave problems and most important, the aircraft would be subsonic.
P.S. The Northrop F-20 (F414 engine) had no area rule fuselage, for the reasons explained above.