I'd say leave it as is for this season now and regroup next season.
My changes then would be 2pts for H/A/D correct to get away from the loaded draw situation then anyone can pick 10 D if they want, just 2pts for the goal bonus to make it the same reward as any other prediction and 5pts for the weekly winner(s) (forgot we used to have that one)