It looks better with the new powerhead angle. Seeing the surface "rolling" is a god thing for gas exchange and to keep things from settling on the surface. I agree with emmett that your nitrates are too high. Unfortunately, this takes time and routine maintenance. If you are at 30ppm, and do a 50% water change, you are likely to only see them drop to 15ppm. So, it will take many changes to get them down to the needed 0ppm. I am surprised your shrimp made it, and the fish didn't. Your tank is still cycling, and you shouldn't add anything for at least a few more weeks (which gives you time to get your nitrates down). I would take everything your LFS says with a grain of salt. It sounds like he has some good info for you, but he is encouraging you to buy things too soon. I would say to always err on the side of "slower is better." If not for the sake of your bank roll, at least for the sake of the animal's health.
So, great work so far! Keep up with routine maintenance, and slow down. If your tank is reading any nitrates above 5ppm (and personally I'd say above 0ppm), then don't put anything in. Even in your LFS says it's okay. I'd be willing to bet that he wouldn't do the same to his own tank :)
I like your start, and I'll be following your thread if you post more questions...