I wonder how much a PTE housing would help the 4600 RPM fall off? I had a PTE housing with a very similar combo (stock engine with valve springs, THDP, no porting, 3 inch MAF with no screens), and it pulled well all the way up to the 5200+ shift.
My guess would be that turbine housing or...