Help to figure out artist/group/circle relationships for particular artist

So I am trying to polish and fill discography of one particular artist: キセノンP

He was releasing albums under different names of his different doujin circles, of which most of them are basically he alone doing everything, from publishing to writing music, arrangement etc.

Two biggest entities in it are:

Sonic Hybrid Orchestra

There is separate artist for it, problem with it is his moniker SHO, or S.H.O, which is a short version of Sonic Hybrid Orchestra. So some previously uploaded albums ended up under Sonic Hybrid Orchestra release groups, others under キセノンP release groups.

One option is to move them all to Sonic Hybrid Orchestra from キセノンP. But I am not sure that Sonic Hybrid Orchestra actually is a Group. It looks more like a moniker and him identifying himself like this.
Second option is to merge Sonic Hybrid Orchestra into キセノンP and then review all releases and set correct “Credited as”.
On discogs it’s done like this, all releases under SHO/S.H.O/Sonic Hybrid Orchestra are grouped together. So I could make it same here as well. I think I prefer this option more.
https://www.discogs.com/artist/7959269-Sho-41

XM -Xenon Maiden- is his another circle, and a “fictional group” on top. It was a 2 people circle but ended up with him alone again. It is extracted into separate artist. I assume it is correct for fictional groups to have separate artist entry. But then all recordings are attributed to “SHO” or “Xenon-P” or some of his other monikers. As it is done in booklets, in booklets it is always “SHO”/S.H.O"/“Xenon-P” as composer/writer/producer etc, but on discs art there is “XM -Xenon Maiden-” logo. Should recordings be attributed to artist or to this group? Or is it enough, for example, to change only track list artist to “XM -Xenon Maiden-” and then to not touch recordings?

Another actual problem here is all web services lump all releases by XM -Xenon Maiden- and キセノンP (Xenon-P) under same name Xenon-P.

Found some useful style guides for doujin circles