I haven't looked seriously at your code. But this question:
is clear. The answer from multiple papers is 3. That gives a slight advantage over 2. 4 causes problems with lines becoming too long without increasing readability over 3. I am sure that my statement will be controversial. If 2 or 4 are the only options, then use 2.