I moved the tank back to the CG and added a pump on mine and was very happy with the results once I got it dialed in. I also have the battery at the very rear of the radio compartment and a couple of ounces of lead glued under the stab to get the balance point where I liked it.
I'd say go with the relocated tank and pump and come back here for advice if you have trouble getting it to work.