Look into Fourm from sequential and a nord lead a1, can recommend both!
minifreak is awesome, but its filter is wack - it has absolutely zero character if you’re looking for something with a rich core analog sound
i’ve almost sold my xd for similar reasons that you presented, but there’s just nothing quite like it in that price range
maybe give it some time, see what sinevibes has to offer in terms of expanding your xd’s capabilities in the meantime