Base OEM maps are hard to come by. As well, the restrictor / intake geometry will change those maps a good amount.

I would proceed with the mapping plan you have. With the change of the observed...