Im also in the same predicament, ive gone to list my car for sale many times but cant part with it, i saved up for mine for 2 years whilst driving a shed of a 6n2 Polo and searched high and low for the cleanest 1.9tdi i could find and know my cars been looked after since day 1 so i wont sell it.
Insurance now allows me to insure a GTI but like i said i wont sell the diesel
Keep me updated with anything you find and maybe we could get it done together for a reduced price or something, mines also mapped at the moment but i want circa 200 bhp :)