As above, it's your choice really!
Weren't you thinking about changing the exhaust too?
If it were my choice, then given that 18s and decent tyres will cost at least double what a remap would cost I'd do the remap first.
Thinking about it - didn't you also post recently about your cambelt being due?