I would say you are also shifting 500 rpm too soon.
peak hp at 6500 shift at 7000 to get all the benifits.