I thought you had it all under control Beamer but to re-cap:
I have been really confused since the brake light switch entered the picture. I believe I have the front lights figured out. Put in new two-wire sockets and run one wire to the existing parking light wire and the second to the turn signal switch. Pretty simple.
Yup - just be mindful of the pigtail indexing.
Most new sockets are designed for off-set pin bulbs just like the old sockets in the rear.
Since the bulb only goes in the socket one way, it's important the correct feed wire be connected to the correct pigtail wire.
Seven Wire and Four Wire T/S switches both require the two front lamps to have proprietary T/S filaments.
The parking light wiring stays exactly the same, except now are run to the low candle power filaments of your new # 1154 bulbs (or # 1158 using the original sockets with new dual pigtails).
Two wires, a Left and a Right, go from the T/S switch to the high candle power filaments.
It's either that or disable the parking light feature and use # 87 single filament bulbs in the original front sockets.
The Seven Wire units 'share' the brake light filaments.
The Seven Wire T/S lever automatically changes the feed to one of the rear brake lights, from the brake light switch to the flasher unit.
When the signal is cancelled the brake lights function as per usual.
The same 'principle' could apply up front but it's not worth all the required extra redesigning inside of the T/S switch.
Now keep in mind this Seven Wire information is about the new ones readily available with a 4-way hazard switch.
Originals and older models may vary and/or require rebuilding.