Nothing wrong with stretching, but the first money I'd spend would be on a good bike fit. Ask around for a fitter in your area who's experienced with women riders and with the type of riding you like to do (some fitters think only in racing terms, which might not be what you're after). Glad you've found a way to stop the headaches for the time being.