I don't see why the wife of the "incoming" king wouldn't always be titled Queen Consort as a matter of course. So, yes.
Conversely, I think it's kind of sexist that a regnant queen's husband is almost always relegated to the title of prince rather than King Consort.
A King is per definition a monarch so that is a no-go. A Queen is normally a consort and other languages than English use some form of "reigning Queen" for a Queen who is a monarch herself.
If we're going to continue to have monarchy as an institution in the 21st century, I think we can accept that a country will not always have a man be its head of state and that if a queen can be regnant, as is the case in most European monarchies at this point, you can just as easily have a non-regnant king.
Seeing as no one who live in a monarchy ask for this change, I really would find it a weird way to join the 21st century, it would be like a European suggesting that the American constitution should be updated to the 21st century by rewritting it with beatnik slang terms.