If you are going to replace the regulator ( sounds like you need to ), try to get an electronic one over the discrete component one.
The new electronic ones seem to regulate better and are more forgiving.
I would use the 25 SloBlo or 30 regular.
Just a thought.
