Don't forget you're getting extra frictional losses when in fifth gear... even if they're minimal.
I'd stick with what you've got, only use fifth at higher speeds. Keep it there as an option rather than set everything up to use it because you have to.
