I just finished brazing the main tubes on a touring bike. I designed it for a more upright position and found it was best achieved with a 71.5 seat angle and a BB drop of 9.0cm. Add to this a sloping top tube which allowed me to effectively extend or raise the heat tube. I drew out my fit on paper and drew the frame tubes to the fit. This worked well. The BB drop is a bit experimental as I have never gone lower than 8.0 before, but figured with 38-40mm tires it will not be a problem.
You might consider dropping the BB a tad to see how that affects the fit.