I have a few recommendations:-
If, you need a starter rebuilt, there is no better place than stockersstarters.com
If, you need a battery, check out the Deltran Lithium Ion on Amazon. Awesome battery, and guaranteed 5 years.
And finally, the cheap ass solenoid replacement listed on eBay works perfectly, and has done on my bike for many years.
Let's hope though that you don't have to go the those expenses and it's an easier fix.