Combining content breaks category pagination

The post_type parameter for WP_Query can accept an array of post types. This would allow you to combine both streams into a single query which should resolve your current dilemma with pagination.

$query = new WP_Query( array( 'post_type' => array('page','post') ) );

tech