Map and baro come from the MAP.

Is your fuel pressure reg boost referenced? This will have a huge effect on VE table in boost. Scaling the VE for a 2 bar is not hard to start. Copy your 100 kpa to 50 kpa..... and so on. Leave 55 and up flat from the 100 column and bump it if you like, that depends on regulator.