I'm in the same boat - twice. My campaign also features a lot of psionic adversaries. The entire storyline has dealt with the possible return of Auppensor (FR).
I also have 3 kids who do not allow me to design in peace. In truth, I wouldn't want them to. But it does restrict my time available...