This is only my opinion but please please please don't do any of the bodywork yourself this time.
No disrespect but I'd clean it up and keep it standard and only do things as and when you can afford to do it properly.
I just read your whole thread about the replica and it was all going so well until you started to touch the bodywork.
Again, only my opinion - good luck.