Sorry, I didn't get your recommendation.
What do you mean by standard firewall?
And why do I need to manually re-arrange fw4 templates, which I never did before?
My current configuration works fine (unless I upgrade to 24.10.0), could you please explain what exactly seems wrong to you in it?