My electrician is working thru options but I also want to try and think creatively as well.The one advantage here is that unit 1 is currently sharing common power, and this would allow us to split it off.

Properties with power lines overhead are great since no one can build underneath them.  

Dan Powers - New Western

Looks like you have a good healthy savings rate and make sure you set aside funds for both expected and unexpected expenses if you do house hack.

Swapping one breaker takes modest time (15 to 30 minutes if no unexpected issues including time to identify the circuit), but swapping additional circuits at the same time requires very little additional time (probably less than 5 minutes each).If AFCI breakers does not meet code, The possible solution could be as simple as installing a GFI on each circuit.  

I would institute RUBS for the water and make getting the power split up a priority.

Quote from @Dan Powers: Realized I'm late to the party here so maybe I can help @Jenna Hall in her decision.

They are going to be able to navigate unexpected issues and guide you through the project. 

Buyers have significantly more negotiating power.

I had a sewer line collapse at my rental. The city came out and said it isn't city responsibility. Insurance came out and said it isn't covered. Plumbing company doesn't have a payment plan. All in they want $20k that...