I recently moved my 1100+ dives into Scubase
http://www.scubase.net/.
For me it took some sql work but the software has importers that can import dive logs from many other dive log softwares. Also it can download directly from several different computers.
The scubase divelog is very configurable. For instance I added fields for tracking tanks, types and gas usages for upto 10 tanks per dive, added checkboxes for tracking a number of dive conditions I've been tracking, etc
It maintains and displays detailed profile info and it has a number of very nice reporting features and graphs. Also can organize series of dive into "trips" and track and report on them that way as well.
It gives a lot of nice tools for reporting and customizing reports and some searching can be done using the reporting tools but not much for searching for specific text or an individual buddy, etc (though with some SQL can get around that limitation).
Bookmarks