Glad you made contact.
The first service at $558 I can't comment on as I'm not a Aus dealer., but seems High maybe labor more then parts?
First service you should be looking at full bike check over, nuts/bolts/screws. Oil/Filter change, Diff fluid change , grease chassis 4 points.
As for your battery issue, I did have a chat with parts & warranty at Mojo.
They should take care of you.(All customers)