You can simply test your battery yourself, measure voltage on it while cranking... if it drops below 10.5 you need a new powerfull one...though if the starter has a problem which affects the starting too the voltage drop is greater even on a good battery, if the D2 is manual try to bump start it without cranking and if it starts right away you need a new starter, the problem in this case is not the solenoid but some internal short in the winding or on the collector which disturbs the crank signal too

