I don't see a problem with removing or at least raising the Poetics cap. The sheer amount of things it's used for, and none of it is endgame content stuff, makes 2000 very restrictive.
It could at least be raised to 5000 or so.