Do you think he was just messing with me about weed?

I doubt that he has. I reckon that he was just 'sounding you out'...! I work in mental health and I am glad that you are both gonna leave it alone. I have seen and treated enough psychotic weed smoking teenagers to last me a lifetime. Good health to you - there ain't nothing like it!