Try planning with Luna, implementing with Sol with guidelines to not exceed the given scope.

Sounds counter-intuitive at first, but Luna is overall better at sticking with what works. Sol is wicked smart but needs constraints.