What container should I use?

[Kung Fu Hung-Su]

Hey everyone, I've been a fan of encoding DivX video + MP3 audio and sticking it in an AVI container for a while now, but now I'd like to do something a bit more complex. Specifically...

h.264 (with x264 of course =D)
Multiple audio streams in AAC (with Neroencode) or OGG (with BeSweet)
Subtitles, preferably in .srt format.
Chapters, in any format, but I think OGG is most popular.

Is there a container that can do all these things? .mkv comes close I believe but I don't think it takes .srt subtitles, only .idx + .sub?

EDIT: Oh, and if anyone can point me in the direction of some threads or guides relating to h.264 encoding, please post!

[check]

MKV takes anything, period :P in other words, mkv can take srt subs, as well as vobsub, ssa/ass, etc etc
MP4 won't take vorbis audio, but will take the rest (mp4box will automatically convert ogg format chapters to the correct format)