FWIW, I compromised and made a quick tweak to how the now playing queue works because it was bugging me *a lot*.
I submitted a PR to the official repo to make the default behavior of the queue to loop around if you hit 'previous' at the beginning of the queue or 'next' at the end of the queue.