I too was stuck on 23a and 15d. Having been alerted to it here, I quite like the switcheroo wordplay in 15d but I would have strugled to spot that unaided. Similarly the candle-maker/dealer shuffle - that's a bit of a devious trick IMO.
I was also trying to see the Freudian ref/special powers in 25a but of course have now seen it just as I was typing this! :-)