i think stretching everytime is a good thing to do
are you trying to push too big of a gear? have u tried just spinning a lower gear with higher cadence?
my friend quit biking cuz he had a bad knee problem cuz he overdid it and didn't realize it till too late