Sorry, I didn't come back 
What size is your current cage? They can get terretorial over small cages but I can't be sure how small yours is without knowing as the luna comes up as different sizes on different sites!
I have 5 girls in this at the moment:
www.littlepetwarehouse.co.uk/mamble-rat-hamster-narrow-bar-80cm-cage/
It's not ideal, it's smaller than I'd like but it's their temporary/holiday cage that they stay in for short periods. We'll probably upgrade it now as we have five girls and we didn't the last time we needed to use it! According to this calculator it can hold up to 3 rats and it's £40: www.rattycorner.com/odds/calc.shtml
The next size up of the mamble is the 100cm one, it's here:
www.littlepetwarehouse.co.uk/mamble-rat-hamster-narrow-bar-100cm-cage/
That's £50 and it can hold up to 6 rats (and is probably the spare cage we'll upgrade too!). The mamble cages are really really good, the doors are massive, the trays are deep too. For two rats I wouldn't mind using it as a permenant cage, though the height isn't ideal.
The coco cages are also great:
www.littlepetwarehouse.co.uk/coco-rat-hamster-cage-with-platforms-large-100x70x54cm/
We had our first two boys in one for a while but the corner bar spacing may be an issue. You can bend the wires easily with pliers if needed and unless your girls are small I'd say it'd be fine. Only one of mine would fit through the bars (1.2cm) and that's not the 4mo one, we have a very small girl who may be able to get through the side gaps, but I doubt it.
This is a great cage but you will need to use fleece in it:
www.littlepetwarehouse.co.uk/products/hamberley-single-metal-large-cage.html
We used fleece for the three cages we had until fairly recently as our original two boys were allergic to every substrate. Now we're back on substrate which is better for our girls as there are five of them, but but I'd happily put the boys back on fleece. We used to have the Hamberleys, one for my boys and one for my girls. They are wonderful and fleece will be easy to handle with just two rats (even up to four as long asyou change it every 3-5 days) especially with this cage as you can just slide the tray out. We didn't use the stand for ours and our only complaint was the floor space, which isn't an issue for healthy rats who will likely climb more. I regret getting rid of our two! It's been the easiest cage we've had.
Little pet warehouse is a good site to buy cages from, they're cheap, really efficient with delivery and customer service is great. They do label things as suitable for rats which aren't though so read the descriptions of everything.
The Jenny is supposed to be a great cage too but I've no personal experience of it!
RE shelves, we don't bother with shelves at all, gave up soon after getting rats! Hammocks are all they need! Lots and lots of hammocks and other cool things. We've never paid more than £80 for a cage, we will potentially be buying a furet tower later in the year and it's the most we'd ever have spent on a cage.
RE fighting again. You could consider scatter feeding, it would prevent fighting over food. How many hammocks do you have? Or hidey holes? Ideally you need at least one place per rat.
How often do they free range? They need a lot of time out, preferably at least an hour a day and not providing them this can/does cause fighting. My two big girls have been noticeably more bitchy this morning and last night and I'm certain it's because for the past two days we haven't been able to get them out much. I'm certain that they don't have mites now too but I'm still going to treat them preemptively.
Parrot toys are great for cage stimulation. We have a wheel for our girls but only one uses it really
You can make toys for rats quite easily, googling "homemade rat toys" or "homemade ferret toys" comes up with great results!
This site is a great one:
www.dapper.com.au/toys.htm