šŸ”· iFi ZEN CAN Headphone Amplifier

Your G6 measures better than the Zen Can. So I would keep it as your DAC.

If you need something with a remote because the Zen Can is a little far away to adjust the volume You could get a Topping E30.