yes, an extension should work fine. You could probably get a little shorter stem and one with a more extreme angle -- there are 45 degree stems. Moving your saddle forward should be a last resort.