@mofojo Are you in your own house, and plan to be there for the foreseeable future?
If yes, then address the power. Get it right.
Panel (inclusive) through to the wall outlets (inclusive); including dedicated grounds / a sub panel, etc.etc. Your budget will cover all of this.
This will result in tremendous dividends and benefits for your current system as well as any component / system related changes you make going forward.