Sounds like you have great plans for it! I think you've made the right move too, the 380s are a big lump of cash and with a V6S or 350 base car with 10k thrown at it you would have a MUCH more capable car.
TVS1900 is a great shout, certainly more preferable in my eyes to the komotec upgrades...