It wasn't until I tried the vintage EdT that I began to see why it was once marketed as Shalimar for men. It has a deep, ambery smokiness, as you say, which is not so apparent in the current EdT. But I wear and enjoy both.
As the for the EdP, I don't find it at all similar to Habit Rouge EdT. They might as well be different fragrances, as far as I am concerned.