Not sure if you will see this but have you read any of Clavell's followups to Shogun yet? I recently read Shogun as well and really loved it, but haven't had the courage to tackle the other books in the series - as they sound so different (and take place hundreds of years later).
With respect to nonfiction, I enjoyed Schroeder's recent biography of Warren Buffett, entitled the Snowball. It was much less of a hagiography than much of what you read on him. He's a fascinating, complex man.