Setup
Consider a mapping $F$ that takes every point $x$ on the manifold $M$ to the point $x'$ on the same manifold. Under this mapping the field $\phi(x)$ evaluated at the point $x$ changes to $\phi'(x)$ when evaluated at the same point $x$ on the manifold or $\phi'(x')$ when evaluated at the mapped point $x'$. The action before mapping is given by: \[S=\int d^Dx \mathcal{L}(\phi(x), \partial_\mu \phi(x),x)\] whilst that after mapping is: $$S'=\int d^D x' \mathcal{L}(\phi'(x'), \partial'_\mu \phi'(x'),x')$$ I am focusing here on the case of QFT, meaning intergrals are over the whole of Minkowski space.
Noether's Theorem
According to Noether's theorem a continuous symmetry which leaves the action invariant: $$\Delta S=S'-S=0$$ corresponds to a conserved quantity.
The two forms of Noether's Current
I have come across two forms of Noether's current (Peskin & Schroeder, $\S$2.2): $$j^\mu(x)=\frac{\partial \mathcal{L}}{\partial (\partial_\mu\phi)} \delta \phi - \mathcal{J}^\mu\tag{1}$$ where $\mathcal{J}^\mu$ is defined by the mapping of $\mathcal{L}$: $$\mathcal{L}(x) \mapsto \mathcal{L}(x)+\alpha \partial_\mu \mathcal{J}^\mu(x)$$ and (Goldstein, 3rd ed, $\S$13.7): $$j^\nu =\left( \frac{\partial \mathcal{L}}{\partial (\partial_\nu \phi)}\partial_\sigma \phi-\mathcal{L} \delta^\nu_\sigma\right) X^\sigma-\frac{\partial \mathcal{L}}{\partial (\partial_\nu \phi)} \Psi \tag{2}$$ Where $\delta x^\nu=\epsilon X^\nu$ and $\delta \phi=\epsilon \Psi$.
Problem with form (1)
Consider the case of dilation $x^\mu \mapsto (1+\delta\lambda )x^\mu$ then: $$\mathcal{L}(x) \mapsto \mathcal{L}(x)+\delta \lambda x^\mu \partial_\mu \mathcal{L}$$ here the change in $\mathcal{L}$ can not be written as an exact divergence (also the metric on integration will change). This does not therefore seem compatible with (1).
Problem with form (2)
In the derivation of (2) we get the following expression: $$\int \epsilon \frac{d}{d x^\nu} \left(\left( \frac{\partial \mathcal{L}}{\partial (\partial_\nu \phi)}\partial_\sigma \phi-\mathcal{L} \delta^\nu_\sigma\right) X^\sigma-\frac{\partial \mathcal{L}}{\partial (\partial_\nu \phi)} \Psi\right)d^4x =0\tag{13.147}$$ from this Goldstein seems to infer that $$ \frac{d}{d x^\nu} \left(\left( \frac{\partial \mathcal{L}}{\partial (\partial_\nu \phi)}\partial_\sigma \phi-\mathcal{L} \delta^\nu_\sigma\right) X^\sigma-\frac{\partial \mathcal{L}}{\partial (\partial_\nu \phi)} \Psi\right)=0\tag{13.148}$$ which given that we have a fixed range of integration (the whole of space) I cannot see any reason why this should hold.
Question
My question is what is therefore the most general form of Noether's current which can deal with things like scaling? And are my two concerns above justified?