Jim the formula I always used for tank capacity is length X width X height / divide by 240 should get you close in gallons..with basic 15w40 going for $16.50 a gallon,it would be a couple hundred to change that oil..I'd keep workin on it with your 'dewatering' process..great job