My suggestions?
Suspension -- Go longer/stiffer springs and longer shocks for a lift instead of spacers, it'll be a better ride and give you more suspension flex. Look into
Rovertym Engineering
Engine: DII's dont have a distributor, they use a coil pack.. Best combination is Magnecore 8mm and Champion Platinum spark plugs.. Don't use the Bosch +4's spark plugs.
Battery: I have 2 yellow top optimas and a TJM IBS to manage them.. the TJM IBS system is nice but overkill, wire it up to run in parallel, but with a switch to isolate incase you want to kill a battery overnight.
Aedofab Off-Road Fabrications sells a nice dual battery tray for the D2.