Garmin offer a previously repaired replacement. My Etrex 30 replacement looked shiny and new, but the joystick requires rather more force to connect in one direction than I'd expect on a really virgin item.
You can either get a RTM number online, or phone them up 30 seconds after their published opening time - any later and you get the engaged tone. I found the Garmin tech I dealt with to be very helpful.
Good luck
Bryn