Some good ideas there.
I was planning on completely removing Yavin, and definately only one Death Star battle, which Luke would not participate in due to his facing Vader and the Emperor. (So Luke's 'great piloting' may end up being reduced to being shot down on Hoth ;)