I will use xschem for now but that will need some investigation on the state of geda-gaf as well at some point. Would be nice to know if it is better on some parts, it seems to still be maintained (http://git.geda-project.org/geda-gaf/)