well for the onboard air, i think you should go with advanced air systers power tank. i have one in the back of my disco II and i use the 15lb bottle and it does plenty for me. also try the ARB compressor for lockers and filling up tires.
https://www.expeditionexchange.com/onboardair/