Joe, did you ever test this power drain issue? I'm having the same problem with the same year bike, but I'm pretty sure it's just the old age. I also know my battery won't charge unless it's around 3k RPMs, so cruising around town at low RPMs can be a drain too.
Curious to see what you found out!