IMO the term Psytrance is the perfect one to describe the whole scene, even Goa Trance.
After all IMO there are no visible boundaries between Goa and Psy. For me they are the same music, the only difference is that they belong to differents sub-genres.
The today's main subgenres (Goa, Full On, Prog, Suomi, Experimental, Darkpsy etc.) are pretty much ok and 90% of the whole Psytrance music belongs to them.
The rest 10%? I used to call it freestyle Psy, now I just call it plain Psytrance. Don't know, really.