Thank you to everyone. I didn’t even consider a different phone, that’ll be something to look in to when it’s time comes.
I ended up going with the M11 and some IEMs about a month ago, completely forgot about this thread. Started off with tin hifi T4s while I tried to figure out what to go...