Yep totally agree if you don't have an NTE5 linebox at your property and you have a non standard NTE5 its time to contact your SP to get that socket changed over for either an SSFP or an NTE5. If you have an extensions in the house be sure to get the wiring of those checked out to if you get someone who knows what they are doing and has half a wit they will install CAT5 twisted pair cabling for your extensions this puts a noise reduction from your extensions and helps to make your connection better with as little interference as possible. Don't be fooled though by these cables as it is still always best for a better connection to run your router from your master socket.
Regards
Gary