In the grieg, if you're referring to the last measures of the second movement, I think you're going about it wrong. First of all, I would play them both with 1-3 and a very fast shaking rotation of the forearm. And who's counting or noticing the simultaneous "coincidence" of the individual notes of the trills?!