Problem solved today..

Cleaned/checked a few ground cables, changed the map sensor AND the most import thing: the crankshaft position sensor (BDP) should be 0.6mm from the "tooth" of the crankshaft pulley. It was somewhere around 4mm, so correcting this probably solved the problem..

Thanks all for the help.