Have you looked at latest release of GIMP? It's just gotten a fundamental overhaul, including support for non-destructive workflows and better text tools. Still has a long way to go obviously and is moving very slowly, but changes are happening.