I agree with Hamish - you should be incorporating as much swimming as possible.

I think that anyone that is serious about hockey should go to a swim coach and do some sessions with them. They can fix your technique in ways you would never be able too. If you have good technique then you have the ability to build on your speed etc.