OK this is espresso martini v2.0 (v1.1 with the added Bailey's was quite nice but not a martini) which is 80ml each of espresso and kahlua, and 40ml vodka. Another change is that I actually shook this one properly with ice, which I read causes the foamy, creamy quality.
Well this is much better. Really delicious and it does in fact have the creaminess that was missing in the previous version. It's almost perfect, I think the only little tweak I'd make to the next one is to make the espresso a little stronger, the coffee I used was probably actually more of a lungo than an espresso.