What is a safe RPM to make my upshift on a motorcycle?

my actual question is this…

right now im shifting to the next gear between 4k and 5k RPMs..im doing this because the “engine break-in period” WANTS me to not rev higher than 5k for the first 1000 miles. the problem is, i have to go to 5th or 6th gear to get to 40mph lol. is this what they want me to do? and if they do..part two of my question is this. assuming ive ridden the 1000 miles and the engine is broken in so the rule no longer applies. is it ok to wait until a much higher RPM (while avoiding redline) before upshifting? i would imagine 3–4k is SEMI low to upshift. when im doing it now i can do it VERY smooth, but i think its still kind of low. any ideas? (as if you wont have any! this site is fantastic!! lol) thanks guys!!