With 30% and a 16x6 Xoar, I get around 9200 peak. That's a lot of prop so I'm not sure why you are disappointed.
16x6 and 15x8 are very similar power factor so your engine seems to be about right.
Are the results not enough in the air? What bird are you motivating?