They should've gotten rid of the auto-surge and +2 ACC and just give him 2 yellow instead.
Then you've got a situation where R2 could fry a storm trooper outright; that's not ideal. R2 being able to "maybe stun someone" feels about right, thematically.
That can already happen though.