If your A/F readings are anywhere close to accurate,there is quite a bit of power to be gained yet.
Looks like the valvetrain is working good at the rpm you ran it to,I'm confident you will get it sorted out!
Keith