Making a comp friendly marine list

I'm currently starting prep for a tournament at my local store in December.

I discussed the following list with the guy running to get feedback on comp.

1500 Points

HQ

Librarian - Gate of Infinity, Avenger

Troops

Tactical Squad - Plasma Pistol, Plasma Gun, Multi Melta, Drop Pod

Tactical Squad - Plasma Pistol, Melta Gun, Multi Melta, Drop Pod

Tactical Squad - Flamer, Las Cannon, Rhino

Elites

Dreadnought - Twin Linked Las Cannon, Missile Launcher

Dreadnought - Twin Linked Las Cannon, Missile Launcher

Dreadnought - 2 x Twin Linked Auto Cannons

Heavy Support

Vindicator

Vindicator

Predator - Auto Cannon, Heavy Bolter Sponsons

His comments

- 2/10 for comp

- 2 vindicators

- 3 Dreds

- 2 drop pod tactical squads

- Las cannon in a rhino

- Librarian

- 3 heavy support and elite choices

So Trying to bump the score I thought of the following modifications

HQ

Librarian - Might of the Ancients, Avenger

Troops

Tactical Squad - Plasma Pistol, Power Weapon, Melta Bombs, Plasma Gun, Multi Melta, Drop Pod

Tactical Squad - Power Fist, Melta Gun, Multi Melta, Rhino

Tactical Squad - Plasma Gun, Las Cannon, Rhino

Scouts - 4 Snipers, Heavy bolter, Camo Cloaks, Melta Bombs

Scouts - Sgt w/power fist and shot gun, 4 x bolt pistol/Knife

Elites

Dreadnought - Twin Linked Las Cannon, Missile Launcher

Dreadnought - 2 x Twin Linked Auto Cannons

Heavy Support

Vindicator

Thunder Fire Cannon

This time I haven't doubled up a single unit. Its quicker, more aggressive, Less stuff to paint.

Scouts and thunder fires are funky. Scouts with 2+ cover and the thunder fire should generate some hurt.

The next list of interest is my 2000 point horde marine list

Captain w/bolter, bolt pistol

3 x Tac squad w/ Flamer, plasma Cannon

3 x Tac Squad w/melta, multi melta

2 x 10 man assault squad w/ melta bombs

2 x 20 man dev squads w/4 x missile launchers

The feed back I recieved was "to cookie cutter" and unfluffy equipment. Was told by several people this brought the list down to a 3/10

So here is an idea. Once I buy 4 basic weapons for the dev squads I only have 40 points for upgrades

Captain - Bolt Pistol, Power Weapon

Tactical Squad - Plasma Gun, Heavy Bolter

Tactical Squad - Flamer, Plasma cannon

Tactical Squad - Melta Gun, Multi melta

Tactical Squad - Flamer, Missile Launcher

Tactical Squad - Flamer, Missile Launcher

Tactical Squad - Flamer, Heavy Bolter

Assault Squad - Melta Bombs

Assault Squad

Devestator Squad - 2 x Multi Meltas, 2 x Missile Launchers

Devestator Squad - 2 x Heavy Bolters, 2 x Missile Launcher

Hopefully this will bump the score up a little.

Any thoughts. Let me know.