Intake swap, poss gains?
Not sure of your tire diameter, your converter or your trap rpm......But, I have to believe you're over geared in the current configuration.
The fact that you gained 60' and lost mph with the gear swap tell me your converter is fairly tight.
I'd go for a little more duration on the cam to raise your power level upstairs. I think more is to be gained there then a intake swap.