Most of the wires in the diagram match, except for one or two on the cluster, but some reasoning will figure out that they just changed the color code on the two wires. I know this as I had to splice a new front wiring harness on my bike when a previous owner decided to chop the harness and get rid of the cluster. Meth is a helluva drug.
You can wire in LED lights for those indicators as all the cluster is doing is holding the bulbs. Most Sportsters did this. You may want to consider running a small digital speedometer such as a Motogadget or a Koyo, cause nothing is worse than wondering how fast youre really going with the popo in your rear view. The bike will start and run without the cluster. Its not CANBUS.
What headlamp brackets did you use?