its a daft idea to do a swap and not tell the insurer, because your insurance is void. How many points do you get for no insurance?
The job is pointless when you can buy what you want to build. Youll loose money on it doing a swap.
My advise to you is just put up with what you got untill the points are gone. And in that time save up so that you can buy a nice 1.8t when they're off.