I would also prefer a PoE2 system.
The system was fine and i think this is perhaps the best compromise for making a meaningful rest system.
Of course, system works mainly because most of the skills were limited to per fight.