Welcome aboard!
You have a nice system there, but with smart shopping I'm sure you can do better nowadays.
I've found utility power quality to be site specific. If you don't have a really old substation/distribution grid, nearby industry, etc. nearby, clean power may not be an issue. I tried a full battery system (source and amp) years ago in a older subdivision (50 year old house with wiring that would have driven any electrician crazy) and in a new build with ideal electrical system and it made no difference to my ears (confirmed by other members here).
Self-powered speakers is an arena I've been particularly interested in the past year. Keep in mind that studio monitors tend to be dry and un-involving, they're designed to reveal all the warts, versus self-powered speakers meant for home use that are designed to make the music enjoyable (sound good). A few brands crossover between studio and home uses (Adam and Emotiva Pro are a couple of the better known) and a couple promote themselves as both, but aren't really. What's got me jazzed about self-powered speakers is simplicity, overall cost, design advantages, and bass output for a given size that are all possible. Note that self-powered can mean 'powered' (just a passive speaker with manufacturer matched amplifier) or 'active' (one channel of amplification per driver so that the crossover is between source and amps for much better dynamics/flat frequency response/deeper bass performance). Even Stereophile recommends the tiny $200/pair Audioengine A2 and the nearly as small $300/pair PSB Alpha PS1 (which also has subwoofer output). And there are many better/varied options from there any of which could work on desktop or fill a small/medium room: $500/pair Vanatoo Transparent One (with DAC); $650/pair Adam A3X (active with ribbon tweeters); or $1300/pair Quad 9AS (cherry veneer, analog/digital inputs, active, DAC, front controls/remote, the whole package done right).
What sparked my initial interest in self-powered speakers was an audition about 12 years ago between Paradigm Studio 20's ($800/pair 2-way monitors) and Paradigm Active 20's ($1600/pair with same drivers/cabinet size). There was no comparison! The Actives had dynamics through the roof, frequency response was so flat that it made sense of the music, and the bass was unbelievably deep/full. Bystanders were gobsmacked. They bettered the Paradigm Studio 80's ($1600/pair floor standers) in all regards. Unfortunately audiophiles have never warmed up to the concept, due IMO to the loss of part of the hunt/hobby aspects. But why should we try to search for 'acceptable levels' of speaker/amp synergy (with inevitably over designed pieces), spend more, and add extra complexity all the while taking up more space?
If you read Floyd Toole's "Sound Reproduction" you'll find that monitors have another huge advantage: proper in-room bass reproduction requires multiple sources located in opposite ends/corners of the room to avoid peaks and nulls (think of using your hand to move water back and forth in a shallow bath tub, this represents how large bass waves behave in a room). Search audiocircle for 'swarm' to learn more.
The quality of DACs have since the most improvement per dollar of any part of audio, so it's expensive to 'keep up'. Add to that the option for higher resolution materials and it's a 'race to the top'. In light of these sea changes I find comfort in the Schiit BiFrost DAC (good sounding/build quality/priced/upgradable).
Happy hunting and good listening to you.