I am happy you find the b;uetooth indistinguishable on the X16. I use the mac mini for the bluetooth option. That being said it is something I never use.Well, if the bug just won't go away you can consider some additional benefits of a new DAC such as the X16. I cannot stress enough how perfectly audibly transparent and amazingly convenient Bluetooth is. Despite still owning all my original CDs and having a wonderful Rega Apollo CD player, I digitized all of my music and used to use USB to my DACs. Then I started using Bluetooth for all of my portable listening which was most of my listening time for a number of years (I returned to university late in life and used public transit frequently).
I quickly realized that Bluetooth sounded indistinguishable from wired. When I had that epiphany keep in mind that I was using as my portable rig some Oppo PM3, balanced from my Onkyo DP-X1 DAP with lossless flac files (i had to have a balanced cable made for the PM3). My wired experience was pretty solid clearly so when I moved to just Bluetooth from my phone to various quality Bluetooth headphones I was struck by how wonderful the audio quality was, and the convenience was orders of magnitude superior to a wire tether.
I have since done so with my home system and stream from my phone to my X16 and it is blissful. There isn't any difference as compared with wired so if you ever wish to declutter your rig, and or enjoy a significant step up in convenience, perhaps you can justify a new DAC.