I agree with parkdale, get rid of extension wiring if at all possible,
The ADSL Nation faceplates are fine for ADSL, but the Openreach / BT / 'Pressac' ones are excellent, especially if you have a very long line. Unless you have a lot of phones or other types of devices, I would be inclined to stick with the Openreach ones.
If you have VDSL2, then once again I would be inclined to stick with the Openreach units as I don't know if the ADSL Nation ones have been tested on the higher frequencies involved. Does anyone know if the ADSL Nation units are suitable?