If I was you I wouldn't go for a T-Master stem and flat bars, you'll get sick of them pretty quickly... I'd got for an echo team stem and some zoo risers... Helps with gaps etc. The cranks should make a difference for the better too, I was running 160mm cranks for the best part of two years, moved up to 170 recently and haven't looked back. Feels so much nicer. Sorry if thats a bit foggy, I'm shattered.