That is terrible consumption.
As its a map sensor ecu, a boost leak wouldn't affect the tune, so it really sounds like it's running way too rich due to a poor tune.
The fact you picked it up the first time with drivability issues is a warning sign, and the tune still seems bad.
Ad GTSBoy said you should be able yo get better consumption with a properly tuned ecu.
Your options are take it back for fora third shot, go somewhere else, or get a wideband and tune it yourself (just the low load and cruise areas).