...and I would suggest trying polish potato vodka for this one, eg. Chopin or Luksusowa. Potato vodkas are more creamy and subtle, it would reduce the booziness.

I prefer adding just a little bit of lime juice to increase acidity of the cocktail. Additionally, in my opinion it's slightly more spicy and complex.