Add hotter cam or Add hotter head ?

Cam

Like the 340 cam:
430/444 lift
268/276 duration

Will work good with stock heads and the 600 on top.
And it's interesting to hear the comments about the 340 cam in a Teen. Some say you need a convertor and some say you don't. A higher stall convertor should help especially if you are having issues getting it to idle slow enough for gear changes from park to reverse and drive.