It isn't any cheaper to split them up. Not sure what I was thinking here...
Totally rearrange analog PCB to keep in/out capacitors close to their points of use.