Army update

So I finished my chaplain and scouts and have now found three space marine bikes that I put away earlier because I deemed them too difficult to paint at the time of purchase. My army now consists of around 2000 Points, and I am yet to put together an army list for them. Although I trust Jono would love to help me out with this chore somehow right mate?

HQ:
Commander Lysander
3rd Battalion Captain and Command squad with Standard Bearer, Company Champion and Apothecary
Chaplain with power fist and chaplain close combat weapon.
Emperor's Champion with 'The Black Sword' and Master-crafted bolt pistol.

ELITES:
Dreadnought with Twin-Linked lascannon, closed combat weapon and storm bolter.
Terminator Squad 5 members with power fists and storm bolters, with sergeant with power weapon and terminator with autocannon.
Techmarine with retinue of 2 Combat Servitors and 2 Weapon Servitors.

TROOPS:
Tactical Squad 'Fist' Sergeant with bolt pistol and power fist. 1 Heavy bolter, 1 flamer and 7 marines with boltguns.
Tactical Squad 'Hammer' Sergeant with bolt pistol and thunder hammer. 1 Meltagun, 1 Missile Launcher and 7 marines with boltguns.
Tactical Squad 'Regalia' Sergeant with bolt pistol and chainsword. 1 Plasmagun and 1 Missile Launcher. 5 marines with boltguns.
Rhino APC addon with smoke launchers and pintle mounted storm bolter.
Scout Squad 'Cena' Sergeant with shotgun and close combat weapon. 1 Heavy Bolter, 3 with close combat weapons and bolt pistols, 2 with shotguns and three with boltguns.

Fast Attack:
Assault Squad 'Flying Fists' Sergeant with storm bolter and chainsword. 1 Flamer and 3 marines with bolt pistols and chainswords. All have jump packs.

Heavy Support:
Devastator Squad 'Heavy Fists' Sergeant with boltgun. 1 Missile Launcher, 1 Plasma Cannon, 1 Heavy Bolter, 1 Lascannon.
Whirlwind with smoke launchers and pintle mounted storm bolter.
Vindicator with smoke launchers and pintle mounted storm bolter also has machine spirit.
Predator Annihilator twin linked lascannon, heavy bolter turrets and smoke launchers.

What you see is the entirity of the army and models I have available. I hope to add the following in the future:
Elites: Another terminator squad of either class.
Troops: add 2 more boltgun armed marines to squad Regalia just to get it up to its full number of available units. Maybe another 1 or 2 scout or tactical squads to fill up the army list.
Fast Attack: Where I lack the most units, or attack points. Increase the number of my assault squad and maybe add another unit. Possibly add 3 Land Speeders of various designation. Also finish the bike squad I am working on, and maybe add members to it at a later stage.