More timing and less boost is going to give you more power than less timing and more boost.

20-22* is "standard" from the tunes I've seen.

Don't chase the KR monster away on 04+. About 2* KR is normal. Something about a change in sensors from what I recall.