Hi,
My third attempt has yielded pretty good results: the tank still gurgles occasionally, but at least it’s no longer spitting liquid in my face.
However, I realized that the screw on the 510 connector was not tightened from the factory, which caused both the tank and the mod to heat up excessively. 
I took a few pictures of the build:
