tail light wiring problems

I have a '70 fastback that has the shelby tail light conversion. When I got the car the wiring was a mess and the tail lights have been working on and off for a while. I'm planning on re-wiring the car w/ a painless harness (hopefully this winter) but need to get the tail light wiring fixed in the meantime.

There are 6 wires coming from the harness to the rear lights (not including the fuel gauge wires). I've looked at a couple of different wiring diagrams and although they differ I think the following connections need to be made (note: the rear side markers have been removed from the quarters):

1- from headlight switch to both tail lights and license plate light
2- from turn signal switch to right tail turn/stop bulb
3- from turn signal switch to left tail turn/stop bulb
4- from trans to reverse lights
5- from turn signal switch to right side marker (not used)
6- from turn signal switch to left side marker (not used)

Does this sound right?

Can anyone confirm this?

Also, I am having problems w/ my brake light switch. I replaced it but it still is not working. I have heard some people install a pressure switch instead. Has anybody done this? Where is the best place to put the new switch, etc...