I always seem to get scratches on film in trays, so I would go for a tank such as the Combi-Plan. I used to use a Combi-Plan, but switched to a Jobo so I could run sheet and roll film with the same times.
As far as dumping the Ektar - I would first try it out. I have one and it has a very nice look to it, though it also has it's problems with coverage and flare. I don't use it much anymore because I need to remount for my new camera - but I still like it.