360/380 hp crate motor RPM range

Next winter I hope to pull my motor and clean and paint the engine bay. At the same time pull the heads and add 2.02 and port the heads hope to pick 30-40 cfm.
Heads are probably not cracked only 5000 miles on the engine.

Hope to bump it up from the 400-420hp to 450-470 hp and move the peak 5800-6000 rpm.