Thanks Robb for the update.
Here in Europe, this ride is deemed as an overall disappointment. I was really expecting what Disney sold us, an E ticket ride, and no dashed off C ticket. Nethertheless, this ride seems to fit the lack of C ticket attractions in DCA, even if the transitions are messed up.
Have a look at the ride preview of the original E ticket attraction dealing with the Little Mermaid theme, designed by Tony Baxter's team back in the early 90s as a Euro Disneyland phase II planned ride(never built).
see the difference?