Oooh damn, he hates Angel? My ex boyfriend did, too. He hated patchouli.
Prada is another of my favorites, so I'm glad you're able to get away with it. I LOVE Serge Lutens' Borneo 1834, but the cacao scent in it might not be enough to ameliorate the patchouli. Luca Turin couldn't say enough good things about Borneo. I normally shy away from patchouli but in my opinion, it is SO well done in Borneo and I just adore it. Maybe you could try it to see what you think?
A woman that I used to work with wore tons of patchouli, and my boss and coworkers hated that fragrance to hell. I wore Borneo today to a holiday gathering and none of them said anything about my fragrance. Believe me...if they had smelled even the faintest whiff of patchouli they would have mentioned it. Loudly.