No matter what route you go> definetly put the extensions in, $5 bucks anywhere is cheap insurance for that ailment.
IMO< I would move UP to a better higher flowing intake.
A Victor jr or a Team G would be much better choices.
I'm not a cam guy guru by any stretch of the imagination but your cam seems small to me, I'm thinking something in the 610's to 630 lift would be much better suited to your combo.
Cp