A good solution for you might be to use a Monetized Installment Sale instead of a 1031 exchange.

I was selling solar panels in LA.

Options will be considered an installment sale if not properly drawn giving a reason why the sale cannot be made at that option date, see your CPA. 

Can I get a better assessment by installing wooden floors upstairs, putting up a fence, "improving" the kitchen, or having a perfect lawn?

My question is, I have to install new HVAC and new wiring -- while I'm at it, should I install Cat-5 wiring?

Thanks  Another strategy besides a 1031 Exchange for deferring capital gains tax is a Monetized Installment Sale.

If I remember correctly, Lowes installed my carpets for my three bedrooms which ran me a little bit over $2,000 for materials and labor.

Right now the siding and deck are about finished and windows should be delivered and installed by the end of the week.I visited the property today and took some pictures....

After another interesting process with a construction mortgage and then rolling it over into a traditional mortgage, I now have a passive solar, LEED gold compliant house that I meant to live in for the next 50 years...

The drywall install and tape, float and sand will actually further clean the slab as all the dust acts to abrade and gather dirt.