wavendon
I would stop trying to cheap out on your upgrades, otherwise your sound will never improve.....you have a comfortable budget, I would spend it.
Keep the Omega speakers, they are probably good enough for a $3,000 system; and the 94db sensitivity makes an easy load to drive. Same with the Node 2i outputting to your new Modi DAC, though if you are handy I would add the before mentioned LHY linear power supply ($279).
Dump your amplifier, there is nothing you can do to make it suitable. Now buy the best integrated you can afford with the remaining $2,800.....that is the only way to get to the next level. Dump Apple music, and get a Qobuz or Tidal account (I use Qobuz)....also connect the Node 2i directly to your ethernet output from your carrier's box if possible. Then you'll use the phone or iPad to control your music, but not stream
Replace the amplifier! You already have some very good recommendations for amplifier.....I would get an integrated amp, here are a few more:
Brand new Heaven 11 Billie MKII integrated amplifier ($1,900) - Has a tube preamp section, has enough inputs for you, and is very well reviewed by many.....I helped a friend put together a system with the Billie amp, and it really punches above it's weight. 120wpc into 8 ohms, 215 wpc into 4 ohms
Used Hegel H190 integrated amplifier ($2,100) - Recommended already several times, do not got with the H95, the H190 is much much better. Well reviewed, well thought of, and sounds great. 150wpc into 8 ohms, down to 2 ohm stable. Also can stream to the H190, to compare with your current gear
Schitt Ragnarock 2 ($1,100 in silver, $900 in black) - Well thought of, and a very good amplifier for the money.....I'd much prefer the Heaven 11 Billie or the Hegel H190, but the Ragnarock might be the best entry level amp.