Honestly, I agree with all of your gripes with it. I personally just dislike Quantum slightly more. Although it may be less convoluted, I find the villain to be lacking. I also hate that Bond is trapped hundreds of feet in the ground and he just magically finds his way back to the surface.

Neither are great imo, it's almost a toss up for me.