Re: The bulbs in the upper corner of the headlights, what the part #?
its probably a regular 168/194 bulb, though they may officially refer to it as a W5W (wedge, 5 watt, white, i think) or something similar. 194NA bulbs are much more common around here. If they're too bright, try a 164 or a 161 bulb.
take pictures!