Personally I prefer to map the whole engine specifically. this way you have full control over getting an optimisation of power and economy.
what's your lambda target map like? see if you can get a screen dump of it up on here...
To save a screen dump its all '1.00'. Same across the whole map.