Put two small inline fuse holders at the headlight switch for tail, and brake, it will be the simplest way without a lot of rewiring. You can get late model micro fuses and holders which take up very little room. For the headlights, I would switch it to an auto-reset circuit breaker, that way if you have an issue at night, you could isolate the bad bulb or wire and the other side would remain on without getting under the dash to change out a fuse. All the old headlight switches had breakers built into them, if yours does, there's no need to fuse it.
