Hi Steve,
I think you will still be able to buy pure nicotine and high strength solutions based on the wording of the TPD
"No person may produce or supply an electronic cigarette or a refill container which contains a nicotine-containing liquid unless it complies with..."
Pure nicotine and high strength solutions are precursors to the manufacture of e-liquid. They are not usable directly. You have to process them first before they can be used in an electronic cigarette so in my opinion they are not refill containers. I'm not a lawyer but that's certainly what i will be arguing :)
However as im sure you are aware there are moves afoot to put a stop to DIY manufacturing
http://eur-lex.europa.eu/legal-content/EN/TXT/PDF/?uri=COM:2016:269:FIN&from=FR