LA 318 advice

To me, If your gonna do it, (rebuild it) I'd build the short block right, sacrifice on other parts of the build.
You got a good short block with proper pistons can always upgrade the other parts later.