Honestly, it will have to change quite a bit, but it could possibly turn out okay. When you say keep the theme, I don't know if you're talking about keeping the same uniques or keeping it a Rebel Storm squad.

If you want to keep all the same Uniques:

38 - Obi Wan Kenobi
27 - Han Solo, Smuggler
28 - Luke Skywalker, Hoth Pilot Unleashed
20 - Princess Leia
14 - General Rieeken
9 - General Dodonna
8 - R2 D2
6 - Ugnaught Demolitionists x2

(Cost: 150, 9 activations)

This changes every mini but Obi-Wan and R2. There are still pretty much the same uniques, but just different minis of them. If you're looking for a way to just use the minis, and you want an effective squad, you're probably going to have to change the squad up quite a bit. Anyway you put it, you can use some of the old minis, but Rieeken is almost a must. Dodonna and Obi-Wan Jedi Spirit would be nice additions to other versions of this squad (Obi-Wan Jedi Spirit will only be used if you're not using Obi-Wan Kenobi of course). Mouse Droids and Ugnaught demolitionists are also going to be great additions.

In almost any build, I really can't see Luke Skywalker, Jedi Knight being used over Luke, HPU or Luke, Jedi (if you want to use a similar Luke)

Another addition just for thought would be Rieeken, Twi'lek Black Sun Vigo, and a mouse droid or 2 to give minis Evade with Greater Mobile attack.....That would work great for Obi-Wan Kenobi, or Luke Skywalker, Jedi.

Anyway, in terms of using Leia, I usually go with Princess Leia because her Commander Effect the most useful most of the time relative to other Leias' CE.

I hope that helps.

Good Luck

Han Cannon (150)
46 Han Solo, Scoundrel
20 Princess Leia
42 Wookiee Freedom Fighter (x3)
03 Ugnaught Demolitionist
10 Twi'lek Bodyguard
08 R2-D2 (RS)
08 Obi-Wan Kenobi, Jedi Spirit
05 Bespin Guard
08 Wicket

Han Cannon is solid squad that came about during the Alliance and Empire Set. Two of these Han Cannon squads made it into the top 8 at the annual championships. Neither made it to the semi-finals, but both were solid. The reason this squad was so good was due to Leia's commander Effect where she grants one rebel to make an immediate attack at +10 damage and +4 attack. Now there are variations of this squad using Bothan Nobles as well for the same purpose

One of the more solid variations to this squad I have seen lately (still not played yet though) is:

47 Luke's Landspeeder
46 Han Scoundrel
20 Princess Leia
17 Bothan Noble
09 General Dodonna
08 R2-D2
03 Uggie

(This squad is one stsparks72 uses)

This is not an easy squad to use, and you have to practice with it, but it can become a fairly decent squad to use once you get used to figuring out how and when to position Han and the landspeeder to benefit from Leia and the Noble's commander effect.

Like I said before, there are also key rebels that make a big difference in the rebel squads:

General Dodonna: Best tempo controlling mini. Activation control gives a huge bonus to a player who knows how to use it.

General Rieeken: Gives ALL allies mobile attack and evade for just 14 points!

Elite Rebel Commando: Great multipurpose mini. He is known as the swiss army knife of the Rebels. Put him with Rieeken and he'll have mobile attack and evade on top of all of his other gadgets.

Princess Leia: Here commander effect works great for any good shooting rebels (like Han smuggler, Han scoundrel, luke's speeder, etc.)

Han Solo, Scoundrel/Smuggler/Rebel Hero: The scoundrel is all around good, and is usually used in squads without Rieeken. When Smuggler Han is in you really need Rieeken to help him stay alive. I have never played with Rebel Hero, but he is the other Han that does a lot for his team.

Luke, Hoth Pilot Unleashed/Jedi/Champion of the Force: Hoth Pilot Luke is all about distance. He is non-melee and has a Force Push 4 which has been an amazing ability to come into the game. You often see an Obi-Wan or Yoda of Dagobah with him to boost up his force powers for that reason. Luke, Jedi is a very solid melee mini for his cost. Luke, CotF is mostly used for his combo of "Use the Force," and Flurry attack. You can add the Chagrian Mercenary Commander in the squad with this Luke just to boost up his damage on Critical hits, but I usually can find a better way to use 13 points.

Bothan Nobles: Heal 10 and an extra free attack makes that 17 points go a long way.

R2-D2: The cheapest override in the game. Always nice mini.

Wookiee Freedom Fighter: Good at a distance or adjacent (thanks to demolish, charging assault, and momentum).

Yoda of Dagobah: He can help out mostly at 150 and 200 points. It's mostly his CE that makes him so good.

Obi-Wan Jedi Spirit: He is slow, but beneficial to most Han Solos. His problem is he is slow.

Master Kota: He is usually used with K-3PO and mouse droids to get him into position to do force repulse 5. That can be pretty nasty.

Recently they also came out with several Commandos that look like they'll be pretty solid.

That more or less sums up the more solid characters for the rebels. There are only few solid melee beat sticks, but plenty of good shooters, commanders and force users.

I will comment on your squad a little later. There are a few things I would like to say, but I don't have time right now.

Yeah, and smugler can only make 1 attack so he basicly is useless.

Obi Wan Force Spirit was intended for Leia, as you said to "help her survive a lot better".

After looking at the squad as a whole, I decided to take Leia and OWJS out, and replace them with Leia,Hoth Commander plus R2 with Extended Sensor. First off, R2 gives me another door control, Recon and It's a Trap doesn't hurt either. Finally, I chose this Leia because I thought I would get more use out of her CE than I would with the other Leia.