You nailed your pennon to the mast there party.

Not knowing what you currently have, makes it hard to give advise but if they work well enough on a USB stick they are recent enough to have a complete zapping of the old system and a system reinstall, if they are "playing up" as you say, and go for the ADSL, if available, it's a no brainer.