Sounds like a plan to me.
I've never seen someone with such a love hate relationship with their car either it must have only been 2 weeks ago you were on about selling it haha
Good to see you sticking with it though as much as it angers you at times you obviously love it!