Ok to start out with the drug questions, I would try to get test e or cup if you wanted to run the cycle for longer than 8 wks. Longer cycles can be run on prop but it requires a lot of painful injections. You could achieve the same effect using long acting test with estrogen control through an AI. If coming in to watery is your concern you can do the exact same thing using a strong dose of adx, 

As for diet, its really impossible for me to say without seeing how you progressed with and look at the current state. I’d need to see if you were currently gaining fat or losing it. If you were filled up or flat or heavily spilled over. Main think I would do is make only small adjustments at first, keeping muscle, while losing fat. For instance, if a meals calls for 1 cup rice, I might Dial that back to 3/4 cup and continue to find areas of the diet to adjust and watch your body response. This adjusting process is how I would diet you down, from the start to the end of the diet. We continue to make small changes all the way through and then watch the results