You may want to contact Vic Plant in Altona (Melbourne) if he is still doing repair work. He fixed my G1 all those years ago and it has worked faultlessly since.
I no longer have contact with Vic as I now live out in the sticks in regional VIC, but he should be an easy Google or phone directory check.
Let us know how things work out with your G2. I've stayed with G1s as I have four (two I bought new in the '90s, he other two about ten years ago when they were being flogged off dirt-cheaply ex-Japan) and they just go on shooting and shooting. One G1 in my 'arsenal' developed a film rewind problem in 2006 - it wouldn't auto-rewind but after some fiddling around I discovered I could press the manual rewind button with a toothpick which then activated the rewinder - and I left it on a shelf for about a year, but it then fixed itself and has worked well since. These things happen.