if i may, i'm not a fan of static stretching and newest studies that came out are not in favor for it either.

altho some dynamic and banded mobilizations, are great, if you want to static stretch before a workout,

keep it breef 30sec stretches for 2-3 sets

now for the new feature what would be great is a 10 minute dynamic mobility(band) warm up for lower body on lower body days 

and an 

10 minute dynamic mobility (band) warm up for upper body on upper body days.

the best man that could get you started in the right direction is probably Trevor Bachmeyer from Smashwerx

you can find him under "smashwerx" on instagram/facebook/youtube