Havent seen a recent post lately for this topic, i recently over hauled my hoses with new ones I aquired from napa.. I have some new part numbers that might be of interest.
UPPER: Gates 21794- Cutting to fit required
LOWER: Gates 23609- New number- No cutting required! Fit perfectly for me. Most people buy the 21660 and cut it to fit. My napa had an old one that still had a internal spring, but they ordered a second and that one didnt.
UPPPER BYPASS: 20338- cut to fit
LOWER BYPASS: 22276- pia to install but fits perfect.
Just thought id share my findings.