Hello Colombamike
Thanks for your effort. I was somewhat surprised myself about the lack of torpedoes in the specs, but that's what Friedman wrote. Hypothetical 'as completed' versions which (more or less) include the modifications you proposed can be found under AU 'Thiaria: Other People's ships'. I grant you the dates for laying down and completing the first ship may be a little optimistic, given how slowly most British large ship projects proceeded during the war, but I just wanted to see one in Atlantic Camouflage.
Concerning the Oerlikons, the first mass order for 1.500 of these guns was placed by the Admiralty in mid-1939 (according to Wikipedia), so I consider it a safe assumption that they would have replaced the 12,7mm quads on any ship designed in 1940. That events prevented this initial order from being delivered is another matter; this was not foreseeable in January 1940.
Greetings
GD