David:

You are going to need to be far more aggressive to get your algae under control.

1) You need to get your pH down to the lower 7's--chlorine will be more effective. You can use muriatic acid or dry acid, but the muriatic will be faster.
2) 2 gallons of bleach won't be nearly enough. You need to get your FC level up to 15ppm and plan on keeping it there for up to several weeks. You'll need to check your FC level 2 to 3x per day and add bleach as needed. Use MWSmith2's bleach calculator...do a search for it and download it, it's free. Plan on adding lots and lots of bleach over the next few weeks. You can also get liquid chlorine in 5 gallon "carboys" from pool stores. It's usually 12% (exactly twice as much chlorine per gallon as ultra bleach) and you can add a lot of chlorine with it faster and easier and with less waste. But it's usually more expensive than bleach--plus you give a deposit on the carboy. But if it's $12 for the carboy, that's a very good price. Anything under $15 is probably OK.
Remember Liquid Chlorine, liquid shock and bleach are all the same thing--just different concentrations. Regular bleach: 5.25% Ultra/liquid chlorine 6%. Carboys and liquid shock: 12%. PS: Make sure the carboys are recent deliveries because 12% breaks down rapidly to 6%--plan on using it quickly.
3) Brush your pool everyday--you don't have to scrub it and kill yourself and maybe tear your liner, the object is to loosen and open up the algae there to the chlorine.
4) You want to vacuum to waste everyday.
5) Do not use trichlor pucks, or dichlor powder. Your CYA is 30--that's good enough for now. If you want it higher, you can raise it later...Remember, when you are up to your...backbumpers....in alligators it's not the time to think about the objective of draining the swamp....
6) What you need to do is very simple, but not easy. It's not complicated, but it is hard work. You need to be persistant, decisive and patient.