Touch move rule question

Under FIDE rules....
"J'adoube" must be said when intentionally touching a piece but not with the intention of moving it (to centre it on a square for example). Accidentally touching a piece require no such announcement. Rule 4.2.1
When promoting , the choice of piece is only finalised when it touches the promotion square Rule 4.4.4

There is the common sense rule. If your opponent touches the king and it's obvious he wanted to move his queen instead and not just move the king for no reason whatsoever because it cannot castle just yet then a nice player will allow his opponent to take back the move and move another piece. Normally you'd have to say "I adjust" or "Adjust" before you move the piece around before you can touch a piece without having to move it but there are exceptions. If you keep doing it over and over again then something is about to hit the fan and we know it doesn't smell good...
My opponent pushed his pawn to d8. The extra queen was behind other pieces, he pushed a knight out of the way to grab the queen, and then placed it on d8. I didn't say anything, but since he touched the knight first, should he have been forced to promote to a knight?