I liked the Astro 20.   Have you tried the Helios JB45?   It seems that would be an amp you might like.  Vintage character, tons of variations of Marshall and modded Marshall tones, but can also be dialed in with smoother tones more like the XTC with the "modern switch" on the back..    I had UU, Snorkler and JB 45 simultaneously and the JB45 was my favorite and most useful to me playing mostly 70's and early 80's hard rock. (pre hair metal  80's ).