You don't think his cam is too short on duration, at least on the intake side? That's why I said to retard it. With the duration too short and the ICL so early it can't fill the cylinder once it goes past 3000 or so. If he retards is, the piston will be further down the hole, hopefully creating a greater pressure drop.
I'm not a big fan of not enough duration on the intake, adding duration to the exhaust and then opening the the LSA to move the power curve up.
IMO, the OP needs more time to fill the cylinder.