For clarification:
TOS = The Original Series
TMS = The Movie Series (typically referring to 1-6, and not Generations and beyond)
TNG = The Next Generation
DS9, Voy, Ent, = no explanation necessary
TMP = The Motion Picture (ST1)
TWOK = The Wrath of Khan
Also, regarding your Klingon ship, I think you should adjust the weapons. With the exception of DS9, they have their blue pulse-type weapons (or perhaps beams) mounted in the nook of the nacelle pylons (TOS+TNG), while torpedoes are both nose-mounted and aft-mounted between the impulse engines. It was in 2 episodes of DS9 where we saw them firing an orange beam weapon from nose point. Presumably, regardless of the era, they all have additional weapon positions elsewhere on the hull, but these should be the primary and most powerful weapons.