Events+ Custom Theme for Categories

I'm trying to setup a custom theme template for a category archive of events. Paul has been helping me on chat this morning, archived here: https://premium.wpmudev.org/live-support-plugins-and-code/?cid=591 .

So far, we've gotten to the point where the template file is working for normal archive pages (http://ecrp.pottervilla.com/events/2012/07/), but not for the category pages (http://ecrp.pottervilla.com/events/upcoming/)

I have two files newly added to my theme, archive-incsub_events.php and single-incsub_events.php. (The CSS is taken care of). However, the category page is still being handled by index.php.

We've been referencing this file: http://codex.wordpress.org/images/1/18/Template_Hierarchy.png . However, category-upcoming.php doesn't load either.

So, I'm still hunting. If anyone has ideas, I'd be happy to hear them! Otherwise, I'll keep my progress updated here.

- Jonathan