Using the peak HP or peak torque RPM may not be what your motor wants to be shifted at, I learned that on my last pump gas stroker BB motor. It had several different sets of heads on it with a low deck six pack set up, I engine dyno tested it multiple times on three different engine dyno, it always made peak HP between 5500 and 5600 RPM, peak torque between 4500 and 4600 RPM.
At the track it wanted to be shifted at or above 7000 RPM That stupid motor was an over achiever from day one, I learned a lot from it
My message is go test different shift points, maybe start at shifting it at 5500 RPM, then 6000 RPM and then 6500 RPM as long as it is going quicker and faster move the shift point up until it doesn't go quicker or faster by 500 RPM increases, once it stops gaining try splitting the shift rpm by 200 to 300 RPM above and below where it went the best for you. Not all tachs read the same RPM as all other tachs also
Good luck, have fun and test, test and test some more