Raven Guard Squad Colours

I'm having a bit of a conundrum when it comes to choosing the shoulder trim for my raven guard. Index Astartes states that the shoulder trim colour denotes what squad type the marine is in. (Red for Assault, Green for Tactical, Yellow for Devastator).

However, GW has painted all their Raven guard with the red shoulder trim. This may be to show that they are 3rd Company led by Captain Shrike.

(Slightly off topic Imperial Armour 8, they describe Shrike as the leader of the 1st Company Veterans, and Aajz Solari as the Captain of 5th, even though in Index Astartes, which was his first appearance, he is described as leader of the 2nd.  In short nothing adds up!)

When it comes to squad markings, company formation and named heroes, I am slightly OCD and like to get as much "right" as possible. I'm finding this a bit of a headache with Raven Guard as the small pieces of background on them are contradictory.

So far I have only painted Assault marines, (with the red trim) and I don't have any tactical squads in my list, so therefore I am thinking of giving the devastators a yellow trim and sticking with tradition.

The next complication is what company to make my army and who will lead it? I'm going to have to go with one of the 5 Battle companies as I want both Assault marines and Devastors. (Raven Guard companies are supposed to be highly independent in the GW fluff, rarely fighting alongside each other. This is again contradicted by the forgeworld material, which has a strike force assembled from all of the companies)

http://wh40k.lexicanum.com/wiki/Raven_Guard states the following:

First Company: Unknown

Second Company: Captain Aajz Solari

Third Company: Captain Kayvaan Shrike

Fourth Company: Captain Aethon Shaan

Fifth Company: Captain Corvane Valar

(It seems to follow the GW and Black Library fluff as opposed to the forgeworld material).

If there's anyone out there with any knowledge/material that I may have overlooked then feel free to point me in the right direction!