Exactly this. Spotlight remains the best local search but it falls apart with disk space limits.