Go out again and sit on your candidate bikes, on a trainer, at the shop, and have pictures taken from the side, with pedals angled horizontal and vertical.
Come back here and post them. Maybe we can tell you something.
A picture says a thousand words.

When in doubt, take the smaller frame.
You could become very happy on a custom aluminum frame. Leaves more money for componentry.