before removing it i would sugest to somehow pressurize the tank to see if maybe you can fix the problem with it in place. I think you may have a problem with the EVAP canister.
Just get some air pressure in to the tank using the fuel return line ( make sure the pressure is regulated to something line 0.5 bar)... then listen for air escaping.
An even better way would be a smoke machine to put smoke inside the system and check where it's leaking.