The original diagram is fine, although you could transpose 85 and 86 if the system really is positive ground. (connection 86 is relay coil positive).
Stick with a 20A fuse because although the steady state current will be about 10A there will be a significantly greater inrush current at switch-on until the lamp filaments warm up.
John
