Go with your first hunch, I learned long ago that boost leaks can frustrate you like no other. Check your vacuum lines also and zip-tie them all. Good luck.