having had satellites before bookshelves ...
i say go for the bookshelves. better sound quality.
but how much for the modulus? and the beta set (excluding the sub)?
you can probably do better than the infinity sub (if budget permits) otherwise, its fine for music ... and satisfactory for movies