Novara concerning your first point, from how I interpret the writings of the Constitution, there is no concern with setting a legal minimum of 5 as this is still within the Constitutional minimum. I.e. there is no conflict here other than different amounts of illegal depending on how many Senators are present. So long as the law doesn’t change the minimum to less than the Constitution, I think its fine.
Concerning separate laws, I considered this, and will likely rename the law in the final draft. Making it two separate ones would, in my opinion, just slow down the process.
Finally, your last point, I actually agree. Like I said this is just a draft and was mostly just me writing what came to mind without considering the consequences too thoroughly. 4 months sounds like a decent amount of time.
