Port my own heads?

This is just my opinion. The edelbrock heads are whats holding you back, I would port them. Its really not that hard to port heads, just dont be afraid. If you take them apart and clean them you will see an area right away where it should be obvious that there is port restriction, that will be the bowl area at the valve seat. After you port that area it will be painfully obvious where to go next, the guide boss. After that the head bolt pinch just up the port from there and then the port opening itself. I just ported my first Edelbrocks and they picked up 50 cfm plus on the intake side. So that has the potential for 100 additional hp. The vave job is an area that I didnt think there would be any improvement but my machine shop was able to get another 15 cfm from them with just a seat grinding. The pushrod pinch area is sensitive so you will need to sneak up on them. I will take pics of my Eddys today and post them for you to see and compare. I know that you are close to your goal but why not free up some free hp? I think the cam your running is a good cam and I would run the same cam to save money and if your not happy then change it later. I would spend the money on sorting out the other problems you have. Good luck and you can do it!