Just wondering if a bad battery would cause the engine light and battery light to come on at the same time? I connected up to the charger after the ride and started it, both lights went off and stayed off. I left it on the charger all night and the battery is now fully charged. I will check it out again after work. Coould this be something else? Bike ran good while the indicator lights on.
I would start with a volt & load test. That will let you know if battery is keeping the charge, has a dead cell, or weak. Make sure all cable connections are tight and clean.
I would think something with the charging system my be wrong. If all of the lights went off with the charger, the charging system probably isn't putting out enough voltage. Check the voltage with a meter and see what it is putting out while it is running and the battery while it is off.