I believe that you are correct, all expenses related to the sale (commissions, escrow etc) plus the qualified intermediary fees should be added to the the basis and depreciated over time.
