Stronger Privacy Amplification by Shuffling for R\'enyi and Approximate Differential Privacy