TBH i know you had issue with dell but a dell XPS would suit you perfect for internet and have graphics to handle the odd bit of cad.

Try Euro PC they sell dells cheaper and if you ring up they will tell you whats in stock.