In regards to aftermarket, I have spoken to Autobahn Dismantling which takes batteries out of salvage Teslas and can sell or swap a battery or motor. I spoke with them last year and I believe they said they charge $17k for an 85kwh pack and could give me back ~$9k for my 60kwh + $1k to program...