Shorter stem; you've answered our own question, you feel 3-4cm (30-40mm) too stretched out; the only caveat to that I have is don't go 30mm shorter -- go 15 or 20 at MOST. Leave the saddle where it is.