Additionally, I took another look at the front wheel regarding the spoke rubbing against the caliper's banjo bolt and the wheel was about 3mm too far left of center. I corrected this and now there is no more rubbing. The spokes are still uncomfortably close to that bolt, but no rubbing, no problem. I tested this today specifically by braking hard on the downhills with the front brake only. No rubbing.
Also the front pads rub slightly against the rotor and I can't get it to stop. Played with it for over 2 hours this morning and couldn't achieve zero rub. So what I will be doing is opening the reservoir cap, pushing the calipers slightly in and then closing the system off again. What this should do is make the calipers retract further after braking. It will also introduce more "squish" to the braking up front, but it is right now very solid, so a little play is OK.