I can see True20 working for this, but I agree that it isn't ideal. As for later versions, have you considered Unisystem (either cinematic or standard)? I find it to be both exceptionally versatile and also exceedingly non-problematic.