You're correct. Some non-IP rides are hot garbage.
Though I'm a Maelstrom purist, I do agree with nearly everything you said. IP needs to be utilized correctly and when done, can only enhance its attractions. Disney just needs to focus on ride quality first and foremost instead of trying to...