Did you check to make sure your plug wires are on in the right order?
I did this las year. Same symptoms. Drove me nuts. If you exchange the number one for the number two I think it's close enough to run ok above 1000 rpm. I worked on 5 cylinders for years though so my ear may be off a bit.
Just a suggestion befor you tear off the pan.
Jeremy