I switched to a shorter, angled stem last year so that my handlebars are now closer to me and a bit higher (about level with the saddle). My neck and shoulder pains have pretty much gone away completely, even on 5+ hour rides.