Fix queue

[dippanz]

hi, i would like to share with you a problem and a solution that in my opinion help for the app.
i've the latest version.
Is your feature request related to a problem? Please describe.
The problem arises when I try to actively use the queue. I try using the "Add to queue" button, and it places the song at the end of a nearly infinite queue. So I'm forced to not use it. That's why I use "play next" instead (even though the order I want is not correct since it will be reversed by the operating principle of the button itself). Instead, when I tried to use the queue with shuffle active, the song I want to listen immediately after the next one does not play, that is, when I press "play next" the next song will not be the one just added to the queue.

Describe the solution you'd like
What I want is to be able to add songs to the queue using both buttons. When I use "add to queue," I expect to be able to add a song to the end of the queue I'm currently creating, not the one suggested. When I use "play next," I expect every time I add a song, it Will be inserted immediately after the one I'm currently listening to, regardless of shuffle.
NB
Describe alternatives you've considered
The optimal solution, in my opinion, would be to be able to add songs to a new queue indipendent from the suggested queue. This would allow both the "add to queue" and "play next" buttons to be used independently of shuffle or infinite queue. Unlike the queue suggested, the songs should be deleted once they've been listened to. Obviously, this queue should take priority over the other. I ruled out a single priority queue as it would cause problems with shuffle.
Example:
1° case
suggestQueue: [ song 1,..., song n ]
newQueue: []
the song played is Song 1.
2° case
add to queue Song t
suggestQueue: [ song 1,..., song n ]
newQueue: [Song t]
the next song played is Song t
3° case
add to queue Song t+1
add to queue Song t+2
play next song t+3
suggestQueue: [ song 1,..., song n ]
newQueue: [Song t+3,Song t+1,Song t+2 ]
the next song played is Song t+3