I have a similar approach, but the mess can be contained by asking for optimizations and refactors very frequently and only asking for very granular features.