In addition to 18 degrees, you can also adopt 15 degrees for Esha as this is the opinion of students of Imam Abu Haneefa (RA) so there is some leeway.