I like the old pattern. No changes. 50 questions per test. 5 days GS and CSAT on Saturdays. CSAT provides the much needed break from monotony. 50 questions per test are the ideal amount to practice and reflect upon. FLT would have 100. After 2 hours of FLT, I will be a bit tired, and given that SFG lvl 2 is already more on the difficult side (comparatively), that might result in burnout. Keep FLT separate as SFG is all about those 50 questions, nothing more; nothing less.
However, if still FLT has to be added, then increase the fee so as to cover up for increased expenses.