Today I went full bay rum with OSP Bay Rum soap (Obsessive Soap Perfectionist-recommended) and Pinaud Clubman Bay Rum aftershave. Scent of cinnamon is too dominant in the Pinaud in my opinion, but it has an excellent feel and skin looks great afterwards (although it burns like a ....)
Haven't tried OSP soap, but agree totally with your Pinaud observations.