Suz, you are lucky, your hair matches your skin now.
While now I have to use more makeup otherwise can really look off.

I honestly think that you wear both equally well!

I think you can wear both!

Years ago I was told I was an "Autumn". I wore those earthy colors very happily. Recently I went grey, and I've been told my hair and face are cool toned. So who knows.

I echo what so many here have already said about mixing. I had very warm coloring when younger, and even though I color my naturally gray hair a golden brown, my skin tone is shifting cooler as I age. I often find that mixed metals are a great choice. Also slightly different metals and textures like blackened silver, brass, copper, gunmetal. I also find myself wearing lots of pyrite, which is a metallic mineral that I would classify as neutral in tone. And natural horn, which exists in both warm and cool hues.
So, lucky you - you can enjoy it all!