Thanks for you detailed analysis, i think too that segwit activation this summer could send BTC near 4 to 5k$.
Ecosystem evolve very quickly around bitcoin, once scaling debate is over we might attack the 10k$ barrier in 2018.
I guess, 36k$ in 2019 is a real possibility. Nice read :)