No you aren't, you've gotten energy form, and beaten the energy boss, so you are right on track. Just move on into the direction you where going. Aside from finding completely optional treasures or beating optional minor bosses, you are now done with the introduction/demo part of the game. So it is time to move into the wide open waters. From this point on the game gets less linear, so you should explore, gain new abilities and resources, and maybe you can come back later to use those new abilities and resources to get to things you where not able to get to earlier, or not, and explore the skipped parts in an other swimthrough.
