Yes, you have a 2WD and you had a 4x4 filter.
Yes exactly as you say re the pressure switch.
Slightly different but I had my switch 'Teed' so I could have a pressure switch as well as the sender, thats not the answer in your case though as the sandwich plate should work, is it defiantly the correct one?
Martin