Currie Bike acting up

I have had my Currie Ezip for about a year .I have changed out the batterries with alittle bit of a problem but got it figured out. I rewired the PAS wire to the pedal stem. I am getting some wierd sort of temporary short.It will kick back in when I am peddaling or sometimes if I lift the battery pack up and then put it down in the rack Its sporadic and the only time it seems to repeat is every other time I back off the throttle completely.. I am beginning to think it is something in the pas switch at the bottom of the throttle havent taken it apart yet? Any ideas? IT cuts out when you come to a stop and then restart after you peddle a bit? the front brakes have lost their spring out. So I am planning on switching to the horse shoe type, a good idea? I would really like the bike to get up to near 30 any ideas without haveing to rip out the whole 24 VOLT system and go to 36 volts? Thanks In Advance For any Ideas or Help Lee