Since the original questioner asked what would be the better upgrade, I believe it to be by any measure the DAVE DAC. It leaves some space for enjoyable experimentation to try a couple well regarded inexpensive streamers, some mid price and one or two "High End" ones. Hear for yourself via a resolving high quality DAC and make your own mind up.
I would just qualify the answer I gave as assuming you would be looking to use a standalone streamer with the DAVE, if not then of course, moving from a DAP to a decent streamer is the first option