Modernizing farms and adding shroom farm

So I have this save wich I haven't played for a while. I stopped just when shrooms were introduced. I want to modernize my other properties, but I don't know in wich one I should do what. I also have the manor that I'm not using right now but I don't know if shrooms is best there.

For now I have:

Weed --> Bungalow

Meth --> Barn

Coke --> Warehouse

And this all gets mixed in storage unit. It's all the same recipe. Banana, cuke, horse semen, mega bean.

What should I change and do I keep the same recipe for mixing? I'm trying to grind to 10mil net worth.