It kinda depends how mechanical you are anyway.... If you don't know how to fix complicated stuff, you probably won't need complicated tools.. I always take way too many tools, but I'll fix anything on the side of the road.. Sounds like you have a good start, but I'd make sure you also have a good socket set, a couple end wrenches, and maybe a multi meter If you already have them and know how to use them... Otherwise, I'd go with overlander's option of AAA. Have fun!
05 Tj, long arm, one ton, lockers, winches, 39.5" Iroks