I think either way, things will work out well. The important thing is to avoid "paralysis by analysis". Increase your 401k contribution a little (or optionally open a Roth) and increase your mortgage payment a little. That way you've hedged your bets.
Nice avatar, by the way.
