Keep things simple.
Boost tops 1.2bar and AFR 11.5 to start with and no higher than 12.5 as a finish product.
Start logging and pulling timing and logging again.
Keep AFR higher than targeted minimum.
3rd gear is fine.