Wormholes

I'm currently living in a C3 wormhole. I've been using a Raven paired with a Logi V basilisk to run the sites, and so far it's been great but I'm looking to maximize my site completion time. Looking at the hull bonuses, I was thinking of moving to a Typhoon and wanted to see what people thought about my fits.

The goal here is to enable site completion as fast as possible, without spending a huge amount of isk (because of the inevitable gank).


Raven:
CML II x6
Large Shield Transporter II

Republic Fleet TP x2
Adaptive Invul II x2
Thermic Dissipation Field II
Large Shield Extender II x2

BCU II x4
Nanofiber Internal II - No other options due to fitting

Rigs:
Rigor I x2
Anti-EM Screen 1


Proposed Typhoon:
CML II x6
Large Shield Transporter II

Republic Fleet TP x1
Adaptive Invul II x2
Thermic Dissipation Field II
Large Shield Extender II x1

BCU II x2
Caldari Navy BCU x2
Co-Processor II
Drone Damage Amplifier x2

Rigs:
Rigor I x2
Anti-EM Screen 1


In my experience with the Raven so far, I've never dropped below 80% shields, which leads me to believe there's an opportunity to move to the Typhoon for more gank. Both of these will do the same paper DPS, but the Typhoon bonuses will give much greater damage application to smaller targets, which are the majority of C3 site spawns. The Typhoon does require a little pimpage from the CN BCU's, but that's mostly due to fitting.

I'd be interested to know what you guys think!