I'm always very sceptical of tuners power hike claims for the S54 via re-mapping.
Let's face it, it's a N/A engine developing 104BHP/litre ! How many N/A engines beat that by much of a margin ? Even the 458 Italia only gets to 125 BHP/litre (with a 9000rpm max power). The 997 GT3 Gen 2 is 113, GT3 RS 116.9 but guess what, when the S54 was unveiled the GT3RS of the time, the 996 Gen 2, was churning out, yes, you guessed it 104 BHP/litre. So the Z4M is already pretty highly tuned anyway. The CSL M3 carried a near-£20k premium over the regular model for a 17BHP increase. Now I know some of that premium was for carbon fibre bits, fancy seats/wheels etc but that carbon airbox and other under-bonnet changes must have cost at least £7-8k of the premium...for 17 BHP...!
I reckon if you want reliable and noticeable performance gains you need to do what Beedub's done and bolt a supercharger on.