It can be properly treated by just teaching modern quantum theory right away. In the next semester I've to teach my teachers students quantum mechanics, and I'll start my manuscript with a longer qualitative chapter on this didactical problem. I think, it's high time to make particularly future teachers aware of all the bad didactics in the introductory chapters of textbooks.
Of course, I surveyed the existing (German) literature on "Quantum Mechanics for teachers students", and I was shocked that the books provided utterly wrong pictures about quantum theory. Particularly all start with photons, which is the most complicated real-world quantum you can discuss. Allready free photons cannot be adequately discussed without a quite thorough analysis of the Poincare group, and unfortunately there's no time to teach this in this three-semester theory course. Nevertheless, on a qualitative level, one can describe all the modern single-photon experiments correctly without "drawing" the wrong picture of photons as "pointlike particles". One of the textbooks (there's even an English translation: it's Pade, Quantum Mechanics for Pedestrians, Springer 2014, 2 vols) which in principle is a very nice book, discussing modern applications of quantum theory on a level, which is well suited for this target group of students, using discrete-observable examples like spin and polarization states particles or photons etc., discussing Bell inequalities, entanglement, and all that. Hoever, I cannot recommend this book without a bad consciousness, because it's all wrong in its qualitative explanations. Rather than being careful to explain photons in a way of what's really observed and what comes out from the proper analysis of the Poincare group (which of course you cannot give to this target group; it's usually not even fully treated in BSc/MS lectures on QED, because you'd need an entire semester for the mathematics of the Poincare group rather than discussing real physics problems). On this qualitative level you can however still explain it correctly by sticking to what's observed and then just telling the students what comes out of the proper treatment within modern QED.