I was coming down here to suggest roughly the same thing. I do think that the xp system should probably be disconnected from the goals, because that is a frustration I have occasionally in ero dungeons that after a few hard fights I've not managed to actually gain any level progress, but the system itself could still be very useful for uncursing things, or gaining specific perks or abilities, or a variety of other things.