I'd be looking at all connections/terminals including battery, fuse links and especially engine to chassis/battery the earth cable for a loose bolt as I suspect being only two years old connections shouldn't be dirty or corroded.
If it's still under warranty why are you stuffing around with it yourself?
"You don't know what you don't know"
Cheers dave
Bookmarks