Hey Tony, similarly to you i do, if not all, most of the services by myself, my bike pretty much had the same issue for the number of months, it was ride-able but with an annoying noise coming from the derailleur as if the chain was constantly rubbing to something in certain gears and shifting issues despite of my repeated adjustments, finally i figured that it’s not really the derailleur issue but the hanger. Took it to a bike shop and after being warned that there is a possibility that the hanger might snap in the process they realigned the hanger, the situation was improved but not to my full satisfaction, eventually I bought a hanger alignment tool, couldn’t convince myself though to get the recommended Park Tool one, so got the X-tool version at 1/3 of the price and realigned the hanger again all by myself with patience, something that you can’t expect from a bike shop with tones of bikes lined up to attend. Anyways now the noise is all gone and the shifting is so crisp probably even better than when the bike was new. Apparently the hangers are so easy to get bent even by leaning the bike to other bikes or similar situations with the derailleur side, something i used to do and now consciously avoiding, also I gathered that there is no guarantee that the hangers to be dead straight from day one.
Did I help? hope so…..

Cheers,
Nirvan