[Feature Request] Change to queuing

I am running Plex on ROKU using my own media library with Server running on Debian/Jessie.
I queue up music from time to time and discovered this:
After queuing songs, and you are in the process of adding another, you get to going a little fast and didn’t press the right arrow key hard enough to move to the 3 vertical dots, you then press the select button and you end up playing the song and that wipes out everything you have queued. Ouch!!!
It would be great if it would either 1) replace the currently playing song with the one currently playing and leave queue as is. or 2) Warn you that playing the song will wipe out everything you queued. and give you a cancel option or 3) prompt you to chose option 1 or 2.

Also, I think it would be nice if when you open the 3 dots, the “add to queue” would be the default selection if there was already an item in the queue.
I think it is more likely you will add to the queue than “play next” when building a queue.