As far as open source applciations, you can try Eclipse with the PDT(PHP Develoment Tools) plugin. I've found it works well.
If you're willing to pay a little, Zend Studio is a very nice editor, it is based on PDT and Eclipse, but has some nice commercial quality polishing.
I frequently use both these solutions, and would recommend them to anyone. Especially if you're already comfortable with Eclipse.
For SVN support, use the Subclipse plugin to eclipse. The SVN plugin with Aptana I found frustrating also. Zend Studio has a nice SVN wizard. The Subclipse plugin integrates well into Eclipse.