I have the same problem. My solution is to put a few blank folders on my desktop. When I open one of those I effectively have Finder open. It is nevertheless a pain. A fix is needed SOON.

I put a new blank folder on the desktop and open that instead of Finder in Dock. Opening the new folder gives me a finder window.