Missed on this combo?
I think now that you have real flow bench ### and have a dyno sheet to boot............You have a LOT OF INFO for any cam grinder to get it right the 2nt time.....................
You need to decide on the intake, before you look for a new cam.