get nolvadex (tamoxifen) and take 10 or 20 mg a day.
lots of meat , fish , peanut butter , and eggs
diet is always your choice but I personally gain the most weight off sushi and meat
can't beat raw eggs either ( just wash the shell , salmonella is on the outside )
throw the whole egg shell and all in your blender when you prepare a shake cause the calcium is in the shell
If thats too much then take calcium pills I find it helps ease the growing pains when the strength increase hits.
In my personal experience real foods like eggs and meat put more weight on than any shake. I myself have taken whey protein as long as I can remember now I for some reason never touch it.
Increase that testosterone you have take 1.5 cc twice a week or 1.25cc twice a week.
take the tamoxifen or your gains just won't be lean like you are hoping.