A friend offered me his CB900 callipers but they didn't seem to fit - I might have another look then? Picking up the new calliper pistons today so I'll let you know how I go.
I think I might not have the correct master cylinder - Mine has a rectangular reservoir not a round one...