Get Stuck underwater in Jedi Temple

This actually isn't a glitch but is a very odd, and very poorly designed geometrical space under water that Cal falls into. I thought it was a glitch and was stuck but I'm still moving around in a circle, there's not a frame-freeze. The solution is to find the light and then follow it, swimming until you see the cave wall as it curves to the right. Then, you can hit 'x' or swim upwards, and it triggers the cut scene where young Cal is above the water and reaches out to pull you onto the ice. The design of that space is terrible. It shouldn't be (even in Story Mode) that difficult to get your bearing and find the exit. Whomever designed the space here missed the memo where there is 'challenging' and then there's terrible, not fun, and over complicated design. The amount of complaints should have been addressed and the space redesigned in a patch.