What Do I Do Now?? Sa Report Help Ca, With Picture Of Attacker

TW: Sexual Assualt
If you have any sensitivity to sexual assault /r*pe, please be wary of the following post.

******

I need help. I was riding home on my electric scooter in October of last year when my battery died. I stopped at the Chevron in my neighborhood to charge my battery when I was attacked, assaulted, and raped. It has devastated me. I wasn't even far from home and my community, by most means, is considered safe. I have been having nightmares about it over and over since then. I reported it to my local police a week or so later but stupidly admitted to being high at the time of the attack. For reference, I am no stranger to marijuana and was not out of my comfort zone when this all happened. I do not think being sober would have prevented the assault by any means. I am a regular user, so I know my limitations and would never drive when I felt I was impaired. I wish it didn't mention it because they no longer took me seriously. No investigation was launched, and I'm still unsure how to proceed.

Very recently, I was out and saw my attacker in public. Before this, I believed him to be a stranger, but I soon realized he was a homeless man with whom I had had multiple interactions at my local train station. Now, I think I was targeted and even possibly stalked. I was able to get a picture of him.
I want to go to the police with my photo. My friend thinks it is better to report him as someone harassing me, as if it is completely separate from my early report. He believes this will make them take the matter seriously more than if I say I have a picture of my attacker about my previous report.
Is my friend right? Should I try to report him for harassment and /or obtain a restraining order that way? Will the police investigation put me in danger? Does anyone know how to advocate for a sexual assault case even when the victim is intoxicated? What should I do, and how can I feel safe? (or even just more empowered.) What do I do if they say our previous interactions mean I provoked him? Any tips in any of these areas are greatly appreciated.

All help is appreciated. Thank you all for giving me the space to ask these questions.
(I believe my attacker is mentally ill and most likely dangerous. From our interactions, even before my attack, I remember him as possibly narcissistic or even schizophrenic. I include this not with judgment but to provide context for my fear of retaliation.)

​