That would be an improvement. (I would be walking away with the post-covid mini-tournament if we already had that in place!!)
One small refinement (to pip-y's proposal) I would suggest would be, say, 6 points for getting four home wins. It's already quite difficult to get four wins and a bonus at that level would help widen the gaps but give more to play for when you're down the league but have a couple of good weeks.
The only thing I might question in pip-y's proposal is 20 points for all five wins and the goals. Seems to be too much of an accumulator. 15 sounds good since it already incorporates a generous bonus for getting the goals right and the doubling of points for getting all five wins.