Previous and Next Navigation buttons take the user to the wrong posts
You could try the following plugin: http://wordpress.org/plugins/ambrosite-nextprevious-post-link-plus/ It is very customizable in terms of link options and should, as far as I can see, do the job for you. I have very good experience using it up to WP 3.5.