Actually I don't think I did see your setup! Looks great! Thoes little switches are perfect for up there. I have to purchase a few more. I scavenged the last one off an old coffee maker lol. I didn't hook up the ground for the little led's and not sure if I am going to either.
As for the headliner, I removed the visor and that was enough room to sneak it by the glass and headliner without pulling the entire thing. Trust me when I say it's super easy. The a pillar is held on by the 'oh Jesus handle' and one clip that pops off with a little force. The overhead consul is held in by two screws and two reusable clips. Remove the screws and use a little force to remove it.