Instead of 6...Be7, do Bg7. You don't want to weaken your kingside's dark squares unless you plan on fianchettoing your bishop
Instead of 18...Qe7, just retreat the bishop. (The queen laterally protects f7)
I may be wrong but yea