Given all you have done/ are doing, I would be very tempted to get the whole car back together In one piece, do some dry miles for a shakedown check and to reacquaint yourself with how the car now feels and drives, as you will have transformed both the suspension and brakes . Once you are content with all your progress, then raid the piggy bank again for a remap . Given that you had a Mk5 , it will be interesting for you to compare your ( presumably ) o.e Mk5 with your now upgraded Mk4 . At the time of launch of the 1k ( Mk5 ) platform, the reviews all suggested that the Mk5 was a step improvement in handling and grip, but as I have never driven ( or even been in ) a Mk4 I have no idea . You will.
Enjoy