I use both JJPrises in battle.
If I could, I would mix both of your interpretations. I would take Wiley's saucer, secondary hull, nacelles, phasers, and textures, and Baz's impulse engines with a small texture edit, torpedoes, torpedo launcher, pylons, shuttlebay, and nacelle fins.