You shouldn't need to remove the fuel rail, but if you do you're about there. Looks like all that is holding it in are the o-rings on the injectors themselves. I think I would try to leave them in place while removing the lower intake, though, since you should replace the o-rings if you remove the injectors. Although, having said that, now is a good time to have your injectors cleaned and flow-matched...

While you are there, though, you should definitely replace those two 2-inch pieces of rubber fuel line that are connecting the fuel rail to the supply and return lines. I had one of those give way and start dripping raw fuel onto the starter. As you are probably aware, it is a PITA to get to where you are now to replace them.
You should be able to connect those two lines as in your pictured Option 1.
The ICV should be connected to the throttle body intake tube, to one of the ports on the bottom; the valve/cam cover line should go to the bottom of the throttle body.