Upgrading my PC audio on a £800 budget

So currently I have a Goxlr mini, while I've loved using it over the last few years it has officially died on me and I don't want to replace it as the software is dead (no longer being worked on).

I'm looking to get a new audio interface and amp to use with me PC. Any suggestions? Initially I was going to get the 2i2 Gen 4 and a Schiit Magi+/JDS Atom + but I'm open to suggestions.