Try having the divert valve replaced before you go straight for a remap, mine was lacking that punch so had it replaced and the results were amazing. Check out my build and you will the the old valve vs the new.
I am going for a remap soon as I want more power !!!!
Lovely example you have there. I like the colour.