Spell targeting difficulties PS5 & Request for M&K support

So I'm playing the witch, and some spells totally ignore the highlighted target and go for a random mob for no reason. (Primarily experience this with Contagion, and most corpse-consuming spells)
Which really ruins my waveclear combo's and often causes me te get overrun, stuck, and pummeled to death.
It's gotten to a point where I've completely given up on using some spells because the targeting issues make them absolutely unusable and even detrimental to survival.
For starters I hope the spell targeting system gets fixed, I've checked all possible options that could have an influence, but to no avail.

Second of all, GGG, I'm begging you, please please please add mouse & keyboard support on console!!!
That's the one most important feature to me personally, So, please, I'm begging you guys.
I've fallen in love with this game, It'd be such a shame if these issues were to become more of a pain/bother than the amount of fun we can have here.

mouse and keyboard in PoE2 has some auto targeting that makes targeting just about as bad as a controller. (essence drain/contagion).

Also begging for mouse and keyboard for PS5. Pretty please with sugar on top!